Return-Path: X-Original-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7147BD8E6 for ; Thu, 28 Jun 2012 22:14:56 +0000 (UTC) Received: (qmail 98107 invoked by uid 500); 28 Jun 2012 22:14:56 -0000 Delivered-To: apmail-incubator-airavata-commits-archive@incubator.apache.org Received: (qmail 98050 invoked by uid 500); 28 Jun 2012 22:14:56 -0000 Mailing-List: contact airavata-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: airavata-dev@incubator.apache.org Delivered-To: mailing list airavata-commits@incubator.apache.org Received: (qmail 98042 invoked by uid 99); 28 Jun 2012 22:14:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jun 2012 22:14:56 +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; Thu, 28 Jun 2012 22:14:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3DD7F2388847; Thu, 28 Jun 2012 22:14:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1355181 - in /incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system: DoWhileNode.java EndDoWhileNode.java Date: Thu, 28 Jun 2012 22:14:31 -0000 To: airavata-commits@incubator.apache.org From: raminder@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120628221432.3DD7F2388847@eris.apache.org> Author: raminder Date: Thu Jun 28 22:14:30 2012 New Revision: 1355181 URL: http://svn.apache.org/viewvc?rev=1355181&view=rev Log: organized imports and fixed AIRAVATA-505 Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java?rev=1355181&r1=1355180&r2=1355181&view=diff ============================================================================== --- incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java (original) +++ incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java Thu Jun 28 22:14:30 2012 @@ -23,22 +23,13 @@ package org.apache.airavata.workflow.mod import java.util.List; -import javax.xml.namespace.QName; - -import org.apache.airavata.common.utils.WSConstants; import org.apache.airavata.workflow.model.component.ComponentDataPort; import org.apache.airavata.workflow.model.component.system.DoWhileComponent; -import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException; -import org.apache.airavata.workflow.model.graph.DataEdge; import org.apache.airavata.workflow.model.graph.DataPort; -import org.apache.airavata.workflow.model.graph.EPRPort; -import org.apache.airavata.workflow.model.graph.Edge; import org.apache.airavata.workflow.model.graph.Graph; import org.apache.airavata.workflow.model.graph.GraphException; import org.apache.airavata.workflow.model.graph.GraphSchema; import org.apache.airavata.workflow.model.graph.Node; -import org.apache.airavata.workflow.model.graph.Port; -import org.apache.airavata.workflow.model.graph.Port.Kind; import org.xmlpull.infoset.XmlElement; public class DoWhileNode extends SystemNode { @@ -145,7 +136,6 @@ public class DoWhileNode extends SystemN super.parseConfiguration(configElement); XmlElement element = configElement.element(null, XPATH_TAG_NAME); if (element != null) { - // TODO this.xpath = element.requiredText(); } } Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java?rev=1355181&r1=1355180&r2=1355181&view=diff ============================================================================== --- incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java (original) +++ incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java Thu Jun 28 22:14:30 2012 @@ -231,7 +231,7 @@ public class EndDoWhileNode extends Syst @Override protected XmlElement toXML() { XmlElement nodeElement = super.toXML(); - nodeElement.setAttributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE, GraphSchema.NODE_TYPE_MERGE); + nodeElement.setAttributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE, GraphSchema.NODE_TYPE_ENDDOWHILE); return nodeElement; }