Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E82A817442 for ; Fri, 7 Nov 2014 20:30:53 +0000 (UTC) Received: (qmail 50100 invoked by uid 500); 7 Nov 2014 20:30:53 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 50065 invoked by uid 500); 7 Nov 2014 20:30:53 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 50056 invoked by uid 99); 7 Nov 2014 20:30:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 20:30:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7DB8C99D4F9; Fri, 7 Nov 2014 20:30:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chathuri@apache.org To: commits@airavata.apache.org Message-Id: <5f5c0e6856bc409980acef8df2cd770a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: fixing experiment output not set properly Date: Fri, 7 Nov 2014 20:30:53 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/gfac_appcatalog_int 225b6746f -> 0b867da49 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/gfac_appcatalog_int Commit: 0b867da49363dbba47dceaff646d086f09de6c1c Parents: 225b674 Author: chathuriw Authored: Fri Nov 7 15:30:31 2014 -0500 Committer: Chathuri Wimalasena 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 exOut = new ArrayList(); 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 exOut = new ArrayList(); 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 exOut = new ArrayList(); // 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 exOut = new ArrayList(); // 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 experimentInputs = taskData.getApplicationInputs(); + List experimentInputs = experiment.getExperimentInputs(); jobExecutionContext.setInMessageContext(new MessageContext(GFacUtils.getInputParamMap(experimentInputs))); - List outputData = taskData.getApplicationOutputs(); + List outputData = experiment.getExperimentOutputs(); jobExecutionContext.setOutMessageContext(new MessageContext(GFacUtils.getOuputParamMap(outputData))); jobExecutionContext.setProperty(Constants.PROP_TOPIC, experimentID);