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 13:24:19 UTC
git commit: Stdout/err was not handled. AIRAVATA-1077
Repository: airavata
Updated Branches:
refs/heads/master dfb51fcc9 -> b424dfee1
Stdout/err was not handled. AIRAVATA-1077
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b424dfee
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b424dfee
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b424dfee
Branch: refs/heads/master
Commit: b424dfee18c91331e08ce16fe0fa60045fc1b8dd
Parents: dfb51fc
Author: raminder <ra...@apache.org>
Authored: Thu Mar 13 08:24:05 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Thu Mar 13 08:24:05 2014 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/utils/GFacUtils.java | 128 +++----------------
.../apache/airavata/gfac/utils/OutputUtils.java | 4 +-
2 files changed, 20 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b424dfee/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GFacUtils.java
index 9f1e32d..6188de3 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GFacUtils.java
@@ -204,116 +204,24 @@ public class GFacUtils {
} else {
((URIParameterType) actualParameter.getType()).setValue("");
}
-// } else if ("StringArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(StringArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((StringArrayType) actualParameter.getType()).insertValue(i++, arrayValue);
-// }
-// } else {
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((StringArrayType) actualParameter.getType()).insertValue(i++, innerelement.getText());
-// }
-// }
-// } else if ("DoubleArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(DoubleArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((DoubleArrayType) actualParameter.getType()).insertValue(i++, new Double(arrayValue));
-// }
-// } else {
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((DoubleArrayType) actualParameter.getType()).insertValue(i++, new Double(innerelement.getText()));
-// }
-// }
-//
-// } else if ("IntegerArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(IntegerArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((IntegerArrayType) actualParameter.getType()).insertValue(i++, new Integer(arrayValue));
-// }
-// } else {
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((IntegerArrayType) actualParameter.getType()).insertValue(i++, new Integer(innerelement.getText()));
-// }
-// }
-// } else if ("FloatArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(FloatArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((FloatArrayType) actualParameter.getType()).insertValue(i++, new Float(arrayValue));
-// }
-// } else {
-//
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((FloatArrayType) actualParameter.getType()).insertValue(i++, new Float(innerelement.getText()));
-// }
-// }
-// } else if ("BooleanArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(BooleanArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((BooleanArrayType) actualParameter.getType()).insertValue(i++, new Boolean(arrayValue));
-// }
-// } else {
-//
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((BooleanArrayType) actualParameter.getType()).insertValue(i++, new Boolean(innerelement.getText()));
-// }
-// }
-// } else if ("FileArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(FileArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((FileArrayType) actualParameter.getType()).insertValue(i++, arrayValue);
-// }
-// } else {
-//
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((FileArrayType) actualParameter.getType()).insertValue(i++, innerelement.getText());
-// }
-// }
-// } else if ("URIArray".equals(parameter.getParameterType().getName())) {
-// actualParameter = new ActualParameter(URIArrayType.type);
-// Iterator value = element.getChildrenWithLocalName("value");
-// int i = 0;
-// if (!"".equals(element.getText())) {
-// String[] list = StringUtil.getElementsFromString(element.getText());
-// for (String arrayValue : list) {
-// ((URIArrayType) actualParameter.getType()).insertValue(i++, arrayValue);
-// }
-// } else {
-//
-// while (value.hasNext()) {
-// innerelement = (OMElement) value.next();
-// ((URIArrayType) actualParameter.getType()).insertValue(i++, innerelement.getText());
-// }
-// }
+
+ } else if ("StdOut".equals(parameter.getParameterType().getName())) {
+ actualParameter = new ActualParameter(StdOutParameterType.type);
+ if (!"".equals(element.getValue())) {
+ ((StdOutParameterType) actualParameter.getType()).setValue(element.getValue());
+ } else {
+ ((StdOutParameterType) actualParameter.getType()).setValue("");
+ }
+
+ }
+ else if ("StdErr".equals(parameter.getParameterType().getName())) {
+ actualParameter = new ActualParameter(StdErrParameterType.type);
+ if (!"".equals(element.getValue())) {
+ ((StdErrParameterType) actualParameter.getType()).setValue(element.getValue());
+ } else {
+ ((StdErrParameterType) actualParameter.getType()).setValue("");
+ }
+
}
return actualParameter;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b424dfee/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 ae8caee..efcbcd5 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,10 +51,10 @@ public class OutputUtils {
if (actual == null) {
continue;
}
- if ("StdOut".equals(actual.getType().getType().toString()) && paramName == "stdout") {
+ if ("StdOut".equals(actual.getType().getType().toString())) {
((StdOutParameterType) actual.getType()).setValue(stdout);
result.put(paramName, actual);
- } else if ("StdErr".equals(actual.getType().getType().toString()) && paramName == "stderr") {
+ } else if ("StdErr".equals(actual.getType().getType().toString())) {
((StdErrParameterType) actual.getType()).setValue(stderr);
result.put(paramName, actual);
}else if("URI".equals(actual.getType().getType().toString())){