airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: fixing issue during integration test - AIRAVATA-1028
Date Sat, 01 Mar 2014 00:20:54 GMT
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 <lahiru@apache.org>
Authored: Fri Feb 28 19:20:45 2014 -0500
Committer: lahiru <lahiru@apache.org>
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;


Mime
View raw message