You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/03/13 12:24:48 UTC
[1/2] git commit: Type of stdout and error coming as string so added
extra check. AIRAVATA-1077
Repository: airavata
Updated Branches:
refs/heads/master 5b6e610b2 -> dfb51fcc9
Type of stdout and error coming as string so added extra check.
AIRAVATA-1077
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1c06fe07
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1c06fe07
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1c06fe07
Branch: refs/heads/master
Commit: 1c06fe07c1a2761bd20e0f2504b2d322bddc1dbc
Parents: 0a46c0c
Author: raminder <ra...@apache.org>
Authored: Thu Mar 13 07:24:04 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Thu Mar 13 07:24:04 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/utils/OutputUtils.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1c06fe07/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
index bc3367f..ae8caee 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
@@ -51,13 +51,16 @@ public class OutputUtils {
if (actual == null) {
continue;
}
- if ("StdOut".equals(actual.getType().getType().toString())) {
+ if ("StdOut".equals(actual.getType().getType().toString()) && paramName == "stdout") {
((StdOutParameterType) actual.getType()).setValue(stdout);
result.put(paramName, actual);
- } else if ("StdErr".equals(actual.getType().getType().toString())) {
+ } else if ("StdErr".equals(actual.getType().getType().toString()) && paramName == "stderr") {
((StdErrParameterType) actual.getType()).setValue(stderr);
result.put(paramName, actual);
- } else {
+ }else if("URI".equals(actual.getType().getType().toString())){
+ continue;
+ }
+ else {
String parseStdout = parseStdout(stdout, paramName);
if (parseStdout != null) {
MappingFactory.fromString(actual, parseStdout);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dfb51fcc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dfb51fcc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dfb51fcc
Branch: refs/heads/master
Commit: dfb51fcc98d104472ede2a47aaf8d64310f606df
Parents: 1c06fe0 5b6e610
Author: raminder <ra...@apache.org>
Authored: Thu Mar 13 07:24:26 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Thu Mar 13 07:24:26 2014 -0400
----------------------------------------------------------------------
.../client-samples/GetAiravataVersion.php | 17 +
.../client-samples/airavata-client-sample.php | 73 ++
.../lib/AiravataClientFactory.php | 45 ++
.../airavata-php-sdk/lib/Thrift/Thrift.php | 789 +++++++++++++++++++
.../airavata-php-sdk/lib/Thrift/autoload.php | 51 ++
.../src/main/resources/conf/gfac-config.xml | 32 +-
.../gfac/handler/AdvancedSCPInputHandler.java | 149 ++++
.../gfac/handler/AdvancedSCPOutputHandler.java | 110 +++
.../airavata/gfac/handler/SCPOutputHandler.java | 15 +-
.../gsi/ssh/api/job/SlurmOutputParser.java | 2 +-
.../gsi/ssh/impl/GSISSHAbstractCluster.java | 4 +
11 files changed, 1272 insertions(+), 15 deletions(-)
----------------------------------------------------------------------