You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/03/03 19:15:17 UTC
git commit: fixing a todo after output data saving is fixed by
chathuri - AIRAVATA-1028
Repository: airavata
Updated Branches:
refs/heads/master 8252ea599 -> ec4172700
fixing a todo after output data saving is fixed by chathuri - AIRAVATA-1028
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ec417270
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ec417270
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ec417270
Branch: refs/heads/master
Commit: ec4172700cb122332e0c5a3013467b5ff35d6fc0
Parents: 8252ea5
Author: lahiru <la...@apache.org>
Authored: Mon Mar 3 13:15:09 2014 -0500
Committer: lahiru <la...@apache.org>
Committed: Mon Mar 3 13:15:09 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/utils/GFacUtils.java | 7 +------
.../orchestrator/client/OrchestratorClientFactoryTest.java | 3 ++-
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec417270/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 04353b6..40c3ac0 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
@@ -735,12 +735,7 @@ public class GFacUtils {
if (input != null) {
stringObjectHashMap.put(parameters[i].getParameterName(), GFacUtils.getInputActualParameter(parameters[i], input));
} else {
- //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));
+ throw new GFacException("Error finding the parameter: parameter Name" + parameters[i].getParameterName());
}
}
return stringObjectHashMap;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec417270/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
index 4a1bc11..eae6b6c 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
@@ -100,7 +100,8 @@ public class OrchestratorClientFactoryTest {
output.setValue("");
exOut.add(output);
- Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs);
+ Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1",
+ "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "normal", 0, 0, 1, "sds128");