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/07/20 17:04:58 UTC
airavata git commit: Fixed issue with having spacess in application
name
Repository: airavata
Updated Branches:
refs/heads/airavata-0.15-release-branch df9d3a5c9 -> d23b50a4f
Fixed issue with having spacess in application name
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d23b50a4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d23b50a4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d23b50a4
Branch: refs/heads/airavata-0.15-release-branch
Commit: d23b50a4fabc51982aa18d11efee711687c83617
Parents: df9d3a5
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Jul 20 11:04:49 2015 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Jul 20 11:04:49 2015 -0400
----------------------------------------------------------------------
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d23b50a4/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 8d30bb5..be15d30 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -391,9 +391,8 @@ public class BetterGfacImpl implements GFac {
String stdout = objectType.getValue();
String stdoutLocation = null;
if(objectType.getValue() == null || "".equals(objectType.getValue())) {
- stdoutLocation = jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stdout";
- }
- else {
+ stdoutLocation = jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName().replaceAll("\\s+", "") + ".stdout";
+ } else {
stdoutLocation = jobExecutionContext.getOutputDir() + File.separator + stdout;
}
objectType.setValue(stdoutLocation);
@@ -403,7 +402,7 @@ public class BetterGfacImpl implements GFac {
String stderr = objectType.getValue();
String stderrLocation = null;
if(stderr == null || "".equals(stderr)) {
- stderrLocation = jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stderr";
+ stderrLocation = jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName().replace("\\s+", "") + ".stderr";
}
else {
stderrLocation = jobExecutionContext.getOutputDir() + File.separator + stderr;
@@ -425,6 +424,7 @@ public class BetterGfacImpl implements GFac {
private void setUpWorkingLocation(JobExecutionContext jobExecutionContext, ApplicationInterfaceDescription applicationInterface, String scratchLocation) {
+ scratchLocation = (scratchLocation.endsWith("/") ? scratchLocation.substring(0, scratchLocation.length() - 1) : scratchLocation);
/**
* Scratch location
*/
@@ -439,16 +439,8 @@ public class BetterGfacImpl implements GFac {
/*
* Input and Output Directory
*/
-// jobExecutionContext.setInputDir(workingDir + File.separator + Constants.INPUT_DATA_DIR_VAR_NAME);
jobExecutionContext.setInputDir(workingDir);
-// jobExecutionContext.setOutputDir(workingDir + File.separator + Constants.OUTPUT_DATA_DIR_VAR_NAME);
jobExecutionContext.setOutputDir(workingDir);
-
- /*
- * Stdout and Stderr for Shell
- */
- jobExecutionContext.setStandardOutput(workingDir + File.separator + applicationInterface.getApplicationName().replaceAll("\\s+", "") + ".stdout");
- jobExecutionContext.setStandardError(workingDir + File.separator + applicationInterface.getApplicationName().replaceAll("\\s+", "") + ".stderr");
}
private void populateDefaultComputeResourceConfiguration(JobExecutionContext jobExecutionContext, ApplicationInterfaceDescription applicationInterface, ComputeResourceDescription computeResource) {