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 30465D74C for ; Mon, 17 Dec 2012 22:35:01 +0000 (UTC) Received: (qmail 73802 invoked by uid 500); 17 Dec 2012 22:35:00 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 73758 invoked by uid 500); 17 Dec 2012 22:35:00 -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 73747 invoked by uid 99); 17 Dec 2012 22:35:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2012 22:35:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2012 22:34:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 604A7238899C; Mon, 17 Dec 2012 22:34:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423203 - /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Date: Mon, 17 Dec 2012 22:34:39 -0000 To: commits@airavata.apache.org From: chathuri@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121217223439.604A7238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chathuri Date: Mon Dec 17 22:34:38 2012 New Revision: 1423203 URL: http://svn.apache.org/viewvc?rev=1423203&view=rev Log: fixing node name not saving when workflow node saving Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1423203&r1=1423202&r2=1423203&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Mon Dec 17 22:34:38 2012 @@ -46,10 +46,8 @@ import org.apache.airavata.client.api.Ai import org.apache.airavata.common.utils.Pair; import org.apache.airavata.common.utils.WSDLUtil; import org.apache.airavata.common.utils.XMLUtil; -import org.apache.airavata.registry.api.workflow.WorkflowExecution; -import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode; +import org.apache.airavata.registry.api.workflow.*; import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State; -import org.apache.airavata.registry.api.workflow.WorkflowNodeType; import org.apache.airavata.workflow.model.component.Component; import org.apache.airavata.workflow.model.component.amazon.InstanceComponent; import org.apache.airavata.workflow.model.component.amazon.TerminateInstanceComponent; @@ -190,7 +188,7 @@ public class WorkflowInterpreter { workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.INPUTNODE); WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new WorkflowExecution(getConfig().getTopic(), getConfig().getTopic()), node.getID()); - this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeInput(workflowInstanceNode, (String)values[i]); + this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeInput(workflowInstanceNode, keywords[i] + "=" + (String) values[i]); this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowNodeType(workflowInstanceNode, workflowNodeType); } this.config.getNotifier().workflowStarted(values, keywords); @@ -427,7 +425,9 @@ public class WorkflowInterpreter { WorkflowNodeType workflowNodeType = new WorkflowNodeType(); workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.OUTPUTNODE); WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new WorkflowExecution(config.getTopic(), config.getTopic()), node.getID()); - this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeOutput(workflowInstanceNode, ((OutputNode) node).getDescription()); + String portname = node.getName(); + String portValue = ((OutputNode) node).getDescription(); + this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeOutput(workflowInstanceNode, portname + "=" + portValue); this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowNodeType(workflowInstanceNode, workflowNodeType); if (this.config.isActOnProvenance()) {