You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2014/10/28 19:12:55 UTC
[3/6] git commit: renamed .xwf file prefix to .awf and fixed issue
with QName type
renamed .xwf file prefix to .awf and fixed issue with QName type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/723b2e94
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/723b2e94
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/723b2e94
Branch: refs/heads/master
Commit: 723b2e9484585c2a0ce90ccb64ec61597c48df05
Parents: 6e42be7
Author: shamrath <sh...@gmail.com>
Authored: Thu Oct 23 16:44:24 2014 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Thu Oct 23 16:44:24 2014 -0400
----------------------------------------------------------------------
.../workflow/model/component/ws/WSComponentApplication.java | 6 ++++--
.../main/java/org/apache/airavata/xbaya/XBayaConstants.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/723b2e94/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java
index d103538..e7de0e8 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplication.java
@@ -127,7 +127,7 @@ public class WSComponentApplication {
inputParameter.setDefaultValue(inputObject.getAsJsonPrimitive("text").getAsString());
inputParameter.setDescription(inputObject.getAsJsonPrimitive("description").getAsString());
inputParameter.setName(inputObject.getAsJsonPrimitive("name").getAsString());
- // do we need to set type ?
+ inputParameter.setType(QName.valueOf(inputObject.getAsJsonPrimitive("dataType").getAsString()));
wsComponentApplication.addInputParameter(inputParameter);
}
}
@@ -143,7 +143,7 @@ public class WSComponentApplication {
outputParameter = new WSComponentApplicationParameter();
outputParameter.setDescription(outputObject.getAsJsonPrimitive("description").getAsString());
outputParameter.setName(outputObject.getAsJsonPrimitive("name").getAsString());
- // do we need to set type ?
+ outputParameter.setType(QName.valueOf(outputObject.getAsJsonPrimitive("dataType").getAsString()));
wsComponentApplication.addOutputParameter(outputParameter);
}
}
@@ -180,6 +180,7 @@ public class WSComponentApplication {
inputObject.addProperty("description", inputParameter.getDescription());
inputObject.addProperty("name", inputParameter.getName());
inputObject.addProperty("text", inputParameter.getDefaultValue());
+ inputObject.addProperty("dataType", inputParameter.getType().toString());
inputArray.add(inputObject);
}
componentObject.add("Input", inputArray);
@@ -190,6 +191,7 @@ public class WSComponentApplication {
outputObject = new JsonObject();
outputObject.addProperty("description", outputParameter.getDescription());
outputObject.addProperty("name", outputParameter.getName());
+ outputObject.addProperty("dataType" , outputParameter.getType().toString());
outputArray.add(outputObject);
}
componentObject.add("Output", outputArray);
http://git-wip-us.apache.org/repos/asf/airavata/blob/723b2e94/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
index d754450..5331b90 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
@@ -122,7 +122,7 @@ public class XBayaConstants {
/**
* Suffix of a workflow file
*/
- public static final String WORKFLOW_FILE_SUFFIX = ".xwf";
+ public static final String WORKFLOW_FILE_SUFFIX = ".awf";
/**
* File suffix for Jython scripts