You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/11 21:12:51 UTC
[47/50] [abbrv] airavata git commit: fixing experiment output not set
properly
fixing experiment output not set properly
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0b867da4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0b867da4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0b867da4
Branch: refs/heads/master
Commit: 0b867da49363dbba47dceaff646d086f09de6c1c
Parents: 225b674
Author: chathuriw <ka...@gmail.com>
Authored: Fri Nov 7 15:30:31 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Fri Nov 7 15:30:31 2014 -0500
----------------------------------------------------------------------
.../airavata/client/samples/CreateLaunchExperiment.java | 12 ++++++------
.../apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b867da4/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index d437c4a..63fe5ad 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -164,7 +164,7 @@ public class CreateLaunchExperiment {
List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
OutputDataObjectType output = new OutputDataObjectType();
- output.setName("echo_output");
+ output.setName("Echoed_Output");
output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -216,7 +216,7 @@ public class CreateLaunchExperiment {
List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
OutputDataObjectType output = new OutputDataObjectType();
- output.setName("echo_output");
+ output.setName("Echoed_Output");
output.setType(DataType.STRING);
output.setValue("");
exOut.add(output);
@@ -492,12 +492,12 @@ public class CreateLaunchExperiment {
// OutputDataObjectType input = new OutputDataObjectType();
// input.setName("echo_input");
// input.setType(DataType.STRING);
-// input.setValue("echo_output=Hello World");
+// input.setValue("Echoed_Output=Hello World");
// exInputs.add(input);
//
// List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
// OutputDataObjectType output = new OutputDataObjectType();
-// output.setName("echo_output");
+// output.setName("Echoed_Output");
// output.setType(DataType.STRING);
// output.setValue("");
// exOut.add(output);
@@ -592,12 +592,12 @@ public class CreateLaunchExperiment {
// OutputDataObjectType input = new OutputDataObjectType();
// input.setName("echo_input");
// input.setType(DataType.STRING);
-// input.setValue("echo_output=Hello World");
+// input.setValue("Echoed_Output=Hello World");
// exInputs.add(input);
//
// List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
// OutputDataObjectType output = new OutputDataObjectType();
-// output.setName("echo_output");
+// output.setName("Echoed_Output");
// output.setType(DataType.STRING);
// output.setValue("");
// exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b867da4/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 cbf32f7..814efb3 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
@@ -297,10 +297,10 @@ public class BetterGfacImpl implements GFac,Watcher {
applicationContext.setComputeResourcePreference(gatewayResourcePreferences);
jobExecutionContext.setApplicationContext(applicationContext);
- List<InputDataObjectType> experimentInputs = taskData.getApplicationInputs();
+ List<InputDataObjectType> experimentInputs = experiment.getExperimentInputs();
jobExecutionContext.setInMessageContext(new MessageContext(GFacUtils.getInputParamMap(experimentInputs)));
- List<OutputDataObjectType> outputData = taskData.getApplicationOutputs();
+ List<OutputDataObjectType> outputData = experiment.getExperimentOutputs();
jobExecutionContext.setOutMessageContext(new MessageContext(GFacUtils.getOuputParamMap(outputData)));
jobExecutionContext.setProperty(Constants.PROP_TOPIC, experimentID);