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 1D427105B7 for ; Sat, 1 Mar 2014 00:20:57 +0000 (UTC) Received: (qmail 9135 invoked by uid 500); 1 Mar 2014 00:20:56 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 9092 invoked by uid 500); 1 Mar 2014 00:20:55 -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 9066 invoked by uid 99); 1 Mar 2014 00:20:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2014 00:20:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8524B931CBF; Sat, 1 Mar 2014 00:20:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lahiru@apache.org To: commits@airavata.apache.org Message-Id: <2db78fba5097494d9839601ed1c5846b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: fixing issue during integration test - AIRAVATA-1028 Date: Sat, 1 Mar 2014 00:20:54 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/master 804190816 -> a02132482 fixing issue during integration test - AIRAVATA-1028 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a0213248 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a0213248 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a0213248 Branch: refs/heads/master Commit: a02132482a1e522769583f6cd4420c5e22d2dc8e Parents: 8041908 Author: lahiru Authored: Fri Feb 28 19:20:45 2014 -0500 Committer: lahiru Committed: Fri Feb 28 19:20:45 2014 -0500 ---------------------------------------------------------------------- .../apache/airavata/gfac/utils/GFacUtils.java | 23 ++++++-------------- 1 file changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a0213248/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 b027a9c..04353b6 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 @@ -41,21 +41,7 @@ import org.apache.airavata.gfac.context.JobExecutionContext; import org.apache.airavata.model.workspace.experiment.DataObjectType; import org.apache.airavata.registry.api.workflow.ApplicationJob; import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus; -import org.apache.airavata.schemas.gfac.BooleanArrayType; -import org.apache.airavata.schemas.gfac.BooleanParameterType; -import org.apache.airavata.schemas.gfac.DoubleArrayType; -import org.apache.airavata.schemas.gfac.DoubleParameterType; -import org.apache.airavata.schemas.gfac.FileArrayType; -import org.apache.airavata.schemas.gfac.FileParameterType; -import org.apache.airavata.schemas.gfac.FloatArrayType; -import org.apache.airavata.schemas.gfac.FloatParameterType; -import org.apache.airavata.schemas.gfac.IntegerArrayType; -import org.apache.airavata.schemas.gfac.IntegerParameterType; -import org.apache.airavata.schemas.gfac.Parameter; -import org.apache.airavata.schemas.gfac.StringArrayType; -import org.apache.airavata.schemas.gfac.StringParameterType; -import org.apache.airavata.schemas.gfac.URIArrayType; -import org.apache.airavata.schemas.gfac.URIParameterType; +import org.apache.airavata.schemas.gfac.*; import org.apache.axiom.om.OMElement; import org.globus.gram.GramJob; import org.slf4j.Logger; @@ -749,7 +735,12 @@ public class GFacUtils { if (input != null) { stringObjectHashMap.put(parameters[i].getParameterName(), GFacUtils.getInputActualParameter(parameters[i], input)); } else { - throw new GFacException("Parameter:" + input + "is missing"); + //todo remove this once proper registry impl is done + DataObjectType dataObjectType = new DataObjectType(); + dataObjectType.setKey(parameters[i].getParameterName()); + dataObjectType.setType(DataType.STRING.toString()); + dataObjectType.setValue(""); + stringObjectHashMap.put(parameters[i].getParameterName(), GFacUtils.getInputActualParameter(parameters[i], dataObjectType)); } } return stringObjectHashMap;