You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/12/10 20:33:50 UTC
[1/4] airavata git commit: Revert "Merge branch 'master' of"
Repository: airavata
Updated Branches:
refs/heads/master 5b118f8c4 -> 5a1b225fd
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
index bf37ea9..bedfaac 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponent.java
@@ -26,6 +26,7 @@ import java.util.List;
import javax.xml.namespace.QName;
+import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import org.apache.airavata.workflow.model.component.Component;
import org.apache.airavata.workflow.model.component.ComponentControlPort;
@@ -91,8 +92,6 @@ public class WSComponent extends Component {
WSComponentPort port = new WSComponentPort(inputDataObjectType.getName(),inputDataObjectType.getType() , this);
port.setDescription(inputDataObjectType.getDescription());
port.setDefaultValue(inputDataObjectType.getDefaultValue());
- port.setApplicationArgument(inputDataObjectType.getApplicationArgument());
- port.setInputOrder(inputDataObjectType.getInputOrder());
inputs.add(port);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/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 ac4c5cb..5bf9daa 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
@@ -36,6 +36,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -44,9 +46,10 @@ import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.workflow.model.utils.WorkflowConstants;
+import org.apache.airavata.workflow.model.graph.GraphSchema;
import org.xmlpull.infoset.XmlNamespace;
+import xsul.dsig.apache.axis.uti.XMLUtils;
import xsul5.XmlConstants;
@XmlRootElement(name="Application")
@@ -67,7 +70,7 @@ public class WSComponentApplication {
app.setApplicationId("dsfds");
app.setName("dfd");
app.setDescription("sdfdsfds");
- app.addInputParameter(new WSComponentApplicationParameter("asas", new QName("sdf"), null, "sdfds", 1));
+ app.addInputParameter(new WSComponentApplicationParameter("asas", new QName("sdf"), null, "sdfds"));
app.addOutputParameter(new WSComponentApplicationParameter("9842", new QName("sdv99304"), null, null));
app.addOutputParameter(new WSComponentApplicationParameter("AAAAA", new QName("sdfd"), "sdfsdf", "243bs sd fsd fs f dfd"));
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -109,42 +112,38 @@ public class WSComponentApplication {
public static WSComponentApplication parse(JsonObject applicationObject) {
WSComponentApplication wsComponentApplication = new WSComponentApplication();
- wsComponentApplication.description = applicationObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_COMPONENT_DESCRIPTION).getAsString();
- wsComponentApplication.name = applicationObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_COMPONENT_NAME).getAsString();
- wsComponentApplication.applicationId = applicationObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_COMPONENT_APPLICATION).getAsString();
+ wsComponentApplication.description = applicationObject.getAsJsonPrimitive("description").getAsString();
+ wsComponentApplication.name = applicationObject.getAsJsonPrimitive("name").getAsString();
+ wsComponentApplication.applicationId = applicationObject.getAsJsonPrimitive("application").getAsString();
- if (applicationObject.get(WorkflowConstants.APPLICATION_INPUT) != null) {
- JsonArray inputArray = applicationObject.getAsJsonArray(WorkflowConstants.APPLICATION_INPUT);
- WSComponentApplicationParameter inputParameter;
- JsonObject inputObject;
- for (JsonElement jsonElement : inputArray) {
- if (jsonElement instanceof JsonObject) {
- inputObject = (JsonObject) jsonElement;
- inputParameter = new WSComponentApplicationParameter();
- inputParameter.setDefaultValue(inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_DEFAULT_VALUE).getAsString());
- inputParameter.setDescription(inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_DESCRIPTION).getAsString());
- inputParameter.setName(inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_NAME).getAsString());
- inputParameter.setType(QName.valueOf(inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_DATA_TYPE).getAsString()));
- inputParameter.setInputOrder(inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_INPUT_ORDER).getAsInt());
- if (inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_APP_ARGUMENT) != null) {
- inputParameter.setApplicationArgument(inputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_APP_ARGUMENT).getAsString());
- }
- wsComponentApplication.addInputParameter(inputParameter);
- }
- }
- }
+ if (applicationObject.get("Input") != null) {
+ JsonArray inputArray = applicationObject.getAsJsonArray("Input");
+ WSComponentApplicationParameter inputParameter;
+ JsonObject inputObject;
+ for (JsonElement jsonElement : inputArray) {
+ if (jsonElement instanceof JsonObject) {
+ inputObject = (JsonObject) jsonElement;
+ inputParameter = new WSComponentApplicationParameter();
+ inputParameter.setDefaultValue(inputObject.getAsJsonPrimitive("text").getAsString());
+ inputParameter.setDescription(inputObject.getAsJsonPrimitive("description").getAsString());
+ inputParameter.setName(inputObject.getAsJsonPrimitive("name").getAsString());
+ inputParameter.setType(QName.valueOf(inputObject.getAsJsonPrimitive("dataType").getAsString()));
+ wsComponentApplication.addInputParameter(inputParameter);
+ }
+ }
+ }
- if (applicationObject.get(WorkflowConstants.APPLICATION_OUTPUT) != null) {
- JsonArray outputArray = applicationObject.getAsJsonArray(WorkflowConstants.APPLICATION_OUTPUT);
+ if (applicationObject.get("Output") != null) {
+ JsonArray outputArray = applicationObject.getAsJsonArray("Output");
WSComponentApplicationParameter outputParameter;
JsonObject outputObject;
for (JsonElement jsonElement : outputArray) {
if (jsonElement instanceof JsonObject) {
outputObject = (JsonObject) jsonElement;
outputParameter = new WSComponentApplicationParameter();
- outputParameter.setDescription(outputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_DESCRIPTION).getAsString());
- outputParameter.setName(outputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_NAME).getAsString());
- outputParameter.setType(QName.valueOf(outputObject.getAsJsonPrimitive(WorkflowConstants.APPLICATION_DATA_DATA_TYPE).getAsString()));
+ outputParameter.setDescription(outputObject.getAsJsonPrimitive("description").getAsString());
+ outputParameter.setName(outputObject.getAsJsonPrimitive("name").getAsString());
+ outputParameter.setType(QName.valueOf(outputObject.getAsJsonPrimitive("dataType").getAsString()));
wsComponentApplication.addOutputParameter(outputParameter);
}
}
@@ -171,35 +170,31 @@ public class WSComponentApplication {
public JsonObject toJSON() {
JsonObject componentObject = new JsonObject();
- componentObject.addProperty(WorkflowConstants.APPLICATION_COMPONENT_DESCRIPTION, this.description);
- componentObject.addProperty(WorkflowConstants.APPLICATION_COMPONENT_NAME, this.name);
- componentObject.addProperty(WorkflowConstants.APPLICATION_COMPONENT_APPLICATION, this.applicationId);
+ componentObject.addProperty("description", this.description);
+ componentObject.addProperty("name", this.name);
+ componentObject.addProperty("application", this.applicationId);
JsonArray inputArray = new JsonArray();
JsonObject inputObject;
for (WSComponentApplicationParameter inputParameter : this.inputParameters) {
inputObject = new JsonObject();
- inputObject.addProperty(WorkflowConstants.APPLICATION_DATA_DESCRIPTION, inputParameter.getDescription());
- inputObject.addProperty(WorkflowConstants.APPLICATION_DATA_NAME, inputParameter.getName());
- inputObject.addProperty(WorkflowConstants.APPLICATION_DATA_DEFAULT_VALUE, inputParameter.getDefaultValue());
- inputObject.addProperty(WorkflowConstants.APPLICATION_DATA_DATA_TYPE, inputParameter.getType().toString());
- inputObject.addProperty(WorkflowConstants.APPLICATION_DATA_INPUT_ORDER, inputParameter.getInputOrder());
- if (inputParameter.getApplicationArgument() != null) {
- inputObject.addProperty(WorkflowConstants.APPLICATION_DATA_APP_ARGUMENT, inputParameter.getApplicationArgument());
- }
- inputArray.add(inputObject);
+ 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(WorkflowConstants.APPLICATION_INPUT, inputArray);
+ componentObject.add("Input", inputArray);
JsonArray outputArray = new JsonArray();
JsonObject outputObject;
for (WSComponentApplicationParameter outputParameter : this.outputParameters) {
outputObject = new JsonObject();
- outputObject.addProperty(WorkflowConstants.APPLICATION_DATA_DESCRIPTION, outputParameter.getDescription());
- outputObject.addProperty(WorkflowConstants.APPLICATION_DATA_NAME, outputParameter.getName());
- outputObject.addProperty(WorkflowConstants.APPLICATION_DATA_DATA_TYPE, outputParameter.getType().toString());
- outputArray.add(outputObject);
+ outputObject.addProperty("description", outputParameter.getDescription());
+ outputObject.addProperty("name", outputParameter.getName());
+ outputObject.addProperty("dataType" , outputParameter.getType().toString());
+ outputArray.add(outputObject);
}
- componentObject.add(WorkflowConstants.APPLICATION_OUTPUT, outputArray);
+ componentObject.add("Output", outputArray);
return componentObject;
}
@@ -216,10 +211,8 @@ public class WSComponentApplication {
namespace = XmlConstants.BUILDER.newNamespace("xsd", WSConstants.XSD_NS_URI);
String prefix = "xsd";
QName type = new QName(namespace.getName(), typeName, prefix);
-
- addInputParameter(new WSComponentApplicationParameter(inputDataObjectType.getName(), type,
- inputDataObjectType.getUserFriendlyDescription(), inputDataObjectType.getValue(),
- inputDataObjectType.getApplicationArgument(), inputDataObjectType.getInputOrder()));
+
+ addInputParameter(new WSComponentApplicationParameter(inputDataObjectType.getName(),type ,inputDataObjectType.getUserFriendlyDescription(), inputDataObjectType.getValue()));
}
List<OutputDataObjectType> applicationOutputs = application.getApplicationOutputs();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplicationParameter.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplicationParameter.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplicationParameter.java
index d472991..92f6e56 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplicationParameter.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentApplicationParameter.java
@@ -28,34 +28,22 @@ import javax.xml.bind.annotation.XmlValue;
import javax.xml.namespace.QName;
@XmlRootElement(name="Parameter")
-@XmlType(propOrder = {"name", "type", "description", "defaultValue", "applicationArgument", "inputOrder"})
+@XmlType(propOrder = {"name", "type", "description", "defaultValue"})
public class WSComponentApplicationParameter {
private String name;
private QName type;
private String description;
private String defaultValue;
- private String applicationArgument;
- private int inputOrder;
-
+
public WSComponentApplicationParameter() {
}
-
- public WSComponentApplicationParameter(String name, QName type, String description, String defaultValue) {
- this(name, type, description, defaultValue, "", -1);
- }
-
- public WSComponentApplicationParameter(String name, QName type, String description, String defaultValue, int inputOrder) {
- this(name, type, description, defaultValue, "", inputOrder);
- }
-
+
public WSComponentApplicationParameter(String name, QName type,
- String description, String defaultValue, String applicationArgument, int inputOrder) {
+ String description, String defaultValue) {
this.name = name;
this.type = type;
this.description = description;
this.defaultValue = defaultValue;
- this.applicationArgument = applicationArgument;
- this.inputOrder = inputOrder;
}
@XmlAttribute (required = true)
@@ -89,22 +77,5 @@ public class WSComponentApplicationParameter {
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
-
- @XmlAttribute
- public String getApplicationArgument() {
- return applicationArgument;
- }
-
- public void setApplicationArgument(String applicationArgument) {
- this.applicationArgument = applicationArgument;
- }
-
- @XmlAttribute
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
+
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java
index 49dbd26..259744e 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentPort.java
@@ -29,6 +29,9 @@ import org.apache.airavata.workflow.model.component.ComponentDataPort;
import org.apache.airavata.workflow.model.component.ComponentException;
import org.apache.airavata.workflow.model.graph.ws.WSPort;
import org.xmlpull.infoset.XmlElement;
+import org.xmlpull.infoset.XmlNamespace;
+
+import xsul5.XmlConstants;
public class WSComponentPort extends ComponentDataPort {
@@ -55,10 +58,6 @@ public class WSComponentPort extends ComponentDataPort {
private boolean optional;
- private String applicationArgument;
-
- private int inputOrder;
-
/**
* Creates WSComponentPort
*
@@ -153,22 +152,6 @@ public class WSComponentPort extends ComponentDataPort {
this.value = value;
}
- public String getApplicationArgument() {
- return applicationArgument;
- }
-
- public void setApplicationArgument(String applicationArgument) {
- this.applicationArgument = applicationArgument;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
/**
* @return The appinfo element.
*/
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
index 2b8ef85..abfc9b6 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/BPELScript.java
@@ -366,7 +366,7 @@ public class BPELScript {
private void addComment() {
XmlComment comment = this.process.xml().newComment(
- "\nThis document is automatically generated by " + WorkflowConstants.APPLICATION_NAME_ + " "
+ "\nThis document is automatically generated by " + WorkflowConstants.APPLICATION_NAME + " "
+ ApplicationVersion.VERSION + ".\n");
this.process.xml().insertChild(0, "\n");
this.process.xml().insertChild(0, comment);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java
index 1ad3a0d..2a9db54 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/gpel/script/WorkflowWSDL.java
@@ -37,6 +37,7 @@ import org.apache.airavata.workflow.model.graph.DataPort;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.Node;
import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
import org.apache.airavata.workflow.model.graph.system.ParameterNode;
import org.apache.airavata.workflow.model.graph.system.ReceiveNode;
import org.apache.airavata.workflow.model.graph.system.SystemDataPort;
@@ -266,7 +267,7 @@ public class WorkflowWSDL {
private void addComment() {
XmlComment comment = this.definitions.xml().newComment(
- "\nThis document is automatically generated by " + WorkflowConstants.APPLICATION_NAME_ + " "
+ "\nThis document is automatically generated by " + WorkflowConstants.APPLICATION_NAME + " "
+ ApplicationVersion.VERSION + ".\n");
this.definitions.xml().insertChild(0, "\n");
this.definitions.xml().insertChild(0, comment);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/GraphSchema.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/GraphSchema.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/GraphSchema.java
index 3c9a94a..9ae3353 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/GraphSchema.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/GraphSchema.java
@@ -386,5 +386,4 @@ public class GraphSchema {
public static final String NODE_TYPE_DIFFERED_INPUT = "Differed Input";
- public static final String PORT_INPUT_ORDER = "inputOrder";
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java
index 745ad28..c0bbf55 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/InputNode.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.workflow.model.component.Component;
import org.apache.airavata.workflow.model.component.system.InputComponent;
@@ -56,10 +57,6 @@ public class InputNode extends ParameterNode {
private boolean visibility;
- private String applicationArgument;
-
- private int inputOrder;
-
/**
* Creates an InputNode.
*
@@ -93,22 +90,6 @@ public class InputNode extends ParameterNode {
this.visibility = visibility;
}
- public String getApplicationArgument() {
- return applicationArgument;
- }
-
- public void setApplicationArgument(String applicationArgument) {
- this.applicationArgument = applicationArgument;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
/**
* @see org.apache.airavata.workflow.model.graph.impl.NodeImpl#getComponent()
*/
@@ -384,8 +365,6 @@ public class InputNode extends ParameterNode {
setDescription(componentPort.getDescription());
setDefaultValue(componentPort.getDefaultValue());
setMetadata(componentPort.getAppinfo());
- setApplicationArgument(componentPort.getApplicationArgument());
- setInputOrder(componentPort.getInputOrder());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/utils/WorkflowConstants.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/utils/WorkflowConstants.java b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/utils/WorkflowConstants.java
index ffba116..1b70528 100644
--- a/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/utils/WorkflowConstants.java
+++ b/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/utils/WorkflowConstants.java
@@ -27,7 +27,7 @@ public class WorkflowConstants {
/**
* The name of the application
*/
- public static final String APPLICATION_NAME_ = "XBaya Dashboard";
+ public static final String APPLICATION_NAME = "XBaya Dashboard";
/**
* Namespace URI
@@ -49,18 +49,4 @@ public class WorkflowConstants {
*/
public static final String LEAD_NS = "http://extreme.indiana.edu/lead/workflow";
-
- public static final String APPLICATION_COMPONENT_DESCRIPTION = "description";
- public static final String APPLICATION_COMPONENT_NAME = "name";
- public static final String APPLICATION_COMPONENT_APPLICATION = "application";
-
- public static final String APPLICATION_DATA_DESCRIPTION = "description";
- public static final String APPLICATION_DATA_NAME = "name";
- public static final String APPLICATION_DATA_DEFAULT_VALUE = "defaultValue";
- public static final String APPLICATION_DATA_DATA_TYPE = "dataType";
- public static final String APPLICATION_DATA_INPUT_ORDER = "inputOrder";
- public static final String APPLICATION_DATA_APP_ARGUMENT = "appArgument";
- public static final String APPLICATION_INPUT = "Input";
- public static final String APPLICATION_OUTPUT = "Output";
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
index 8ed3972..b367dd6 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
@@ -77,7 +77,6 @@ public class ComponentRegistryLoader implements Cancelable, Observer {
public void cancel() {
this.canceled = true;
this.loadThread.interrupt();
- this.loadingDialog.hide();
}
/**
@@ -96,11 +95,11 @@ public class ComponentRegistryLoader implements Cancelable, Observer {
}
};
this.loadThread.start();
+
if (!getComponentTreeNodesMap().containsKey(registry.getName())) {
- // This has to be the last because it blocks when the dialog is modal.
- this.loadingDialog.show();
- }
-
+ // This has to be the last because it blocks when the dialog is modal.
+ this.loadingDialog.show();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java
index 84249a9..03130be 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/system/InputConfigurationDialog.java
@@ -28,6 +28,7 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import javax.xml.namespace.QName;
+import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.graph.system.InputNode;
import org.apache.airavata.xbaya.lead.LEADTypes;
@@ -68,7 +69,7 @@ public class InputConfigurationDialog {
* Constructs an InputConfigurationWindow.
*
* @param node
- * @param xbayaGUI
+ * @param engine
*/
public InputConfigurationDialog(InputNode node, XBayaGUI xbayaGUI) {
this.xbayaGUI=xbayaGUI;
@@ -85,26 +86,26 @@ public class InputConfigurationDialog {
boolean knownType = LEADTypes.isKnownType(type);
if (knownType) {
textComponent = this.valueTextField;
- this.valueLabel.setText("Value");
+ this.valueLabel.setText("Default value");
} else {
textComponent = this.valueTextArea;
- this.valueLabel.setText("Value (in XML)");
+ this.valueLabel.setText("Default value (in XML)");
}
this.valueLabel.setLabelFor(textComponent);
- final int index = 3;
+ final int index = 7;
this.gridPanel.remove(index);
this.gridPanel.add(textComponent, index);
if (knownType) {
- this.gridPanel.layout(new double[] { 0,0, 1.0 / 2}, new double[] { 0, 1 });
+ this.gridPanel.layout(new double[] { 0, 1.0 / 2,0, 0, 1.0 / 2 }, new double[] { 0, 1 });
} else {
- this.gridPanel.layout(new double[] { 0, 1.0 / 3,0, 1.0 / 3}, new double[] { 0, 1 });
+ this.gridPanel.layout(new double[] { 0, 1.0 / 3,0, 1.0 / 3, 1.0 / 3 }, new double[] { 0, 1 });
}
String name = this.node.getID(); // Show ID.
this.nameTextField.setText(name);
-// String visibility = Boolean.toString(this.node.isVisibility());
-// this.visibilityTextField.setText(visibility);
+ String visibility = Boolean.toString(this.node.isVisibility());
+ this.visibilityTextField.setText(visibility);
this.descriptionTextArea.setText(this.node.getDescription());
Object value = this.node.getDefaultValue();
@@ -122,14 +123,14 @@ public class InputConfigurationDialog {
this.valueTextArea.setText(valueString);
}
textComponent.setText(valueString);
-// XmlElement metadata = this.node.getMetadata();
-// String metadataText;
-// if (metadata == null) {
-// metadataText = WSConstants.EMPTY_APPINFO;
-// } else {
-// metadataText = XMLUtil.xmlElementToString(metadata);
-// }
-// this.metadataTextArea.setText(metadataText);
+ XmlElement metadata = this.node.getMetadata();
+ String metadataText;
+ if (metadata == null) {
+ metadataText = WSConstants.EMPTY_APPINFO;
+ } else {
+ metadataText = XMLUtil.xmlElementToString(metadata);
+ }
+ this.metadataTextArea.setText(metadataText);
this.dialog.show();
}
@@ -153,8 +154,8 @@ public class InputConfigurationDialog {
String name = this.nameTextField.getText();
String description = this.descriptionTextArea.getText();
String valueString = textComponent.getText();
-// String metadataText = this.metadataTextArea.getText();
-// String visibilityText = this.visibilityTextField.getText();
+ String metadataText = this.metadataTextArea.getText();
+ String visibilityText = this.visibilityTextField.getText();
if (name.length() == 0) {
String warning = "The name cannot be empty.";
@@ -178,25 +179,25 @@ public class InputConfigurationDialog {
}
}
}
-// XmlElement metadata;
-// if (metadataText.length() == 0) {
-// metadata = null;
-// } else {
-// try {
-// metadata = XMLUtil.stringToXmlElement(metadataText);
-// } catch (RuntimeException e) {
-// String warning = "The metadata is ill-formed.";
-// this.xbayaGUI.getErrorWindow().error(warning, e);
-// return;
-// }
-// }
+ XmlElement metadata;
+ if (metadataText.length() == 0) {
+ metadata = null;
+ } else {
+ try {
+ metadata = XMLUtil.stringToXmlElement(metadataText);
+ } catch (RuntimeException e) {
+ String warning = "The metadata is ill-formed.";
+ this.xbayaGUI.getErrorWindow().error(warning, e);
+ return;
+ }
+ }
this.node.setConfigured(true);
this.node.setConfiguredName(name);
this.node.setDescription(description);
this.node.setDefaultValue(value);
-// this.node.setMetadata(metadata);
-// this.node.setVisibility(Boolean.parseBoolean(visibilityText));
+ this.node.setMetadata(metadata);
+ this.node.setVisibility(Boolean.parseBoolean(visibilityText));
hide();
this.xbayaGUI.getGraphCanvas().repaint();
}
@@ -215,25 +216,25 @@ public class InputConfigurationDialog {
this.valueTextArea = new XBayaTextArea(); // for XML
// temporaly set text field.
this.valueLabel = new XBayaLabel("", this.valueTextField);
-//
-// this.metadataTextArea = new XBayaTextArea();
-// XBayaLabel metadataLabel = new XBayaLabel("Metadata", this.metadataTextArea);
-//
-// this.visibilityTextField = new XBayaTextField();
-// XBayaLabel visibilityLabel = new XBayaLabel("Visibility", this.visibilityTextField);
+
+ this.metadataTextArea = new XBayaTextArea();
+ XBayaLabel metadataLabel = new XBayaLabel("Metadata", this.metadataTextArea);
+
+ this.visibilityTextField = new XBayaTextField();
+ XBayaLabel visibilityLabel = new XBayaLabel("Visibility", this.visibilityTextField);
this.gridPanel = new GridPanel();
this.gridPanel.add(nameLabel);
this.gridPanel.add(this.nameTextField);
-// this.gridPanel.add(visibilityLabel);
-// this.gridPanel.add(this.visibilityTextField);
- this.gridPanel.add(this.valueLabel);
- this.gridPanel.add(this.valueTextField);
+ this.gridPanel.add(visibilityLabel);
+ this.gridPanel.add(this.visibilityTextField);
this.gridPanel.add(descriptionLabel);
this.gridPanel.add(this.descriptionTextArea);
-// this.gridPanel.add(metadataLabel);
-// this.gridPanel.add(this.metadataTextArea);
- this.gridPanel.layout(3, 2, 3, 1);
+ this.gridPanel.add(this.valueLabel);
+ this.gridPanel.add(this.valueTextField);
+ this.gridPanel.add(metadataLabel);
+ this.gridPanel.add(this.metadataTextArea);
+ this.gridPanel.layout(5, 2, 3, 1);
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
index 8f49623..6b9ba7c 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
@@ -308,9 +308,6 @@ public class WorkflowInterpreterLaunchWindow {
elem.setName(inputNode.getID());
elem.setType(DataType.STRING);
elem.setValue(value);
- elem.setApplicationArgument(inputNode.getApplicationArgument());
- elem.setInputOrder(inputNode.getInputOrder());
-
experiment.addToExperimentInputs(elem );
}
[4/4] airavata git commit: Revert "Merge branch 'master' of"
Posted by ch...@apache.org.
Revert "Merge branch 'master' of"
This reverts commit 5b118f8c41580d79dfb5707814cac1c628fa2b07, reversing
changes made to 6644942bfd1a3b2214a0497bc7ddaaf6d839fe1d.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5a1b225f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5a1b225f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5a1b225f
Branch: refs/heads/master
Commit: 5a1b225fd4cb0e40953f63e5a0d100a55160d9c3
Parents: 5b118f8
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Dec 10 14:24:57 2014 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Dec 10 14:24:57 2014 -0500
----------------------------------------------------------------------
.../applicationInterfaceModel_types.cpp | 212 ++--------
.../airavata/applicationInterfaceModel_types.h | 124 +-----
.../lib/airavata/experimentModel_types.cpp | 12 +-
.../lib/airavata/experimentModel_types.h | 12 +-
.../lib/airavata/messagingEvents_types.cpp | 4 +-
.../lib/airavata/messagingEvents_types.h | 4 +-
.../lib/airavata/workflowDataModel_types.cpp | 4 +-
.../lib/airavata/workflowDataModel_types.h | 4 +-
.../Model/AppCatalog/AppInterface/Types.php | 167 --------
.../client/samples/RegisterSampleData.java | 14 +-
.../tools/RegisterOGCEUS3Application.java | 2 +-
.../tools/RegisterSampleApplications.java | 85 ++--
.../tools/RegisterSampleApplicationsUtils.java | 3 +-
.../client/tools/RegisterUS3Application.java | 2 +-
.../appinterface/InputDataObjectType.java | 424 +------------------
.../appinterface/OutputDataObjectType.java | 320 +-------------
.../airavata/model/util/AppInterfaceUtil.java | 2 -
.../applicationInterfaceModel.thrift | 29 +-
.../data/impl/ApplicationInterfaceImpl.java | 6 +-
.../catalog/data/impl/WorkflowCatalogImpl.java | 4 +-
.../catalog/data/model/ApplicationInput.java | 40 --
.../catalog/data/model/ApplicationOutput.java | 30 --
.../catalog/data/model/WorkflowInput.java | 44 +-
.../catalog/data/model/WorkflowOutput.java | 30 --
.../resources/ApplicationInputResource.java | 52 +--
.../resources/ApplicationOutputResource.java | 30 --
.../data/resources/WorkflowInputResource.java | 51 +--
.../data/resources/WorkflowOutputResource.java | 33 --
.../catalog/data/util/AppCatalogJPAUtils.java | 18 +-
.../data/util/AppCatalogThriftConversion.java | 28 +-
.../src/main/resources/appcatalog-derby.sql | 7 -
.../src/main/resources/appcatalog-mysql.sql | 7 -
.../app/catalog/test/AppInterfaceTest.java | 2 -
.../src/test/resources/appcatalog-derby.sql | 7 -
.../gfac/local/provider/impl/LocalProvider.java | 41 +-
.../registry/jpa/impl/ExperimentRegistry.java | 38 +-
.../registry/jpa/model/ApplicationInput.java | 86 +---
.../registry/jpa/model/ApplicationOutput.java | 53 +--
.../registry/jpa/model/Experiment_Input.java | 87 +---
.../registry/jpa/model/Experiment_Output.java | 53 +--
.../registry/jpa/model/NodeInput.java | 85 +---
.../registry/jpa/model/NodeOutput.java | 53 +--
.../jpa/resources/ApplicationInputResource.java | 91 +---
.../resources/ApplicationOutputResource.java | 58 +--
.../jpa/resources/ExperimentInputResource.java | 92 +---
.../jpa/resources/ExperimentOutputResource.java | 58 +--
.../jpa/resources/NodeInputResource.java | 92 +---
.../jpa/resources/NodeOutputResource.java | 58 +--
.../registry/jpa/resources/Utils.java | 46 +-
.../jpa/utils/ThriftDataModelConversion.java | 79 +---
.../src/main/resources/registry-derby.sql | 45 +-
.../src/main/resources/registry-mysql.sql | 45 +-
.../jpa/ExperimentInputResourceTest.java | 2 +-
.../jpa/ExperimentOutputResourceTest.java | 2 +-
.../src/test/resources/registry-derby.sql | 45 +-
.../engine/interpretor/WorkflowInterpreter.java | 14 +-
.../model/component/ws/WSComponent.java | 3 +-
.../component/ws/WSComponentApplication.java | 97 ++---
.../ws/WSComponentApplicationParameter.java | 39 +-
.../model/component/ws/WSComponentPort.java | 23 +-
.../workflow/model/gpel/script/BPELScript.java | 2 +-
.../model/gpel/script/WorkflowWSDL.java | 3 +-
.../workflow/model/graph/GraphSchema.java | 1 -
.../workflow/model/graph/system/InputNode.java | 23 +-
.../workflow/model/utils/WorkflowConstants.java | 16 +-
.../registry/ComponentRegistryLoader.java | 9 +-
.../graph/system/InputConfigurationDialog.java | 91 ++--
.../WorkflowInterpreterLaunchWindow.java | 3 -
68 files changed, 486 insertions(+), 2860 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
index 1b40aa0..4a064b0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp
@@ -45,38 +45,8 @@ const char* _kDataTypeNames[] = {
};
const std::map<int, const char*> _DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kDataTypeValues, _kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-int _kValidityTypeValues[] = {
- ValidityType::REQUIRED,
- ValidityType::OPTIONAL
-};
-const char* _kValidityTypeNames[] = {
- "REQUIRED",
- "OPTIONAL"
-};
-const std::map<int, const char*> _ValidityType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kValidityTypeValues, _kValidityTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-int _kCommandLineTypeValues[] = {
- CommandLineType::INCLUSIVE,
- CommandLineType::EXCLUSIVE
-};
-const char* _kCommandLineTypeNames[] = {
- "INCLUSIVE",
- "EXCLUSIVE"
-};
-const std::map<int, const char*> _CommandLineType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kCommandLineTypeValues, _kCommandLineTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-int _kInputMetadataTypeValues[] = {
- InputMetadataType::MEMORY,
- InputMetadataType::CPU
-};
-const char* _kInputMetadataTypeNames[] = {
- "MEMORY",
- "CPU"
-};
-const std::map<int, const char*> _InputMetadataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kInputMetadataTypeValues, _kInputMetadataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
-const char* InputDataObjectType::ascii_fingerprint = "95DCCA621F7BE3FA34349CC6A45329DA";
-const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x95,0xDC,0xCA,0x62,0x1F,0x7B,0xE3,0xFA,0x34,0x34,0x9C,0xC6,0xA4,0x53,0x29,0xDA};
+const char* InputDataObjectType::ascii_fingerprint = "24F962C1CE4BE9FBD0F5D5EE9D1D5C00";
+const uint8_t InputDataObjectType::binary_fingerprint[16] = {0x24,0xF9,0x62,0xC1,0xCE,0x4B,0xE9,0xFB,0xD0,0xF5,0xD5,0xEE,0x9D,0x1D,0x5C,0x00};
uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -157,42 +127,6 @@ uint32_t InputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
- case 8:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->inputOrder);
- this->__isset.inputOrder = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 9:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast1;
- xfer += iprot->readI32(ecast1);
- this->inputValid = (ValidityType::type)ecast1;
- this->__isset.inputValid = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 10:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast2;
- xfer += iprot->readI32(ecast2);
- this->addedToCommandLine = (CommandLineType::type)ecast2;
- this->__isset.addedToCommandLine = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 11:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->dataStaged);
- this->__isset.dataStaged = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -245,26 +179,6 @@ uint32_t InputDataObjectType::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeString(this->metaData);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.inputOrder) {
- xfer += oprot->writeFieldBegin("inputOrder", ::apache::thrift::protocol::T_I32, 8);
- xfer += oprot->writeI32(this->inputOrder);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.inputValid) {
- xfer += oprot->writeFieldBegin("inputValid", ::apache::thrift::protocol::T_I32, 9);
- xfer += oprot->writeI32((int32_t)this->inputValid);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.addedToCommandLine) {
- xfer += oprot->writeFieldBegin("addedToCommandLine", ::apache::thrift::protocol::T_I32, 10);
- xfer += oprot->writeI32((int32_t)this->addedToCommandLine);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.dataStaged) {
- xfer += oprot->writeFieldBegin("dataStaged", ::apache::thrift::protocol::T_BOOL, 11);
- xfer += oprot->writeBool(this->dataStaged);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -279,15 +193,11 @@ void swap(InputDataObjectType &a, InputDataObjectType &b) {
swap(a.standardInput, b.standardInput);
swap(a.userFriendlyDescription, b.userFriendlyDescription);
swap(a.metaData, b.metaData);
- swap(a.inputOrder, b.inputOrder);
- swap(a.inputValid, b.inputValid);
- swap(a.addedToCommandLine, b.addedToCommandLine);
- swap(a.dataStaged, b.dataStaged);
swap(a.__isset, b.__isset);
}
-const char* OutputDataObjectType::ascii_fingerprint = "9B8C3AEA43A2028DF0CEF51E90706E3A";
-const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0x9B,0x8C,0x3A,0xEA,0x43,0xA2,0x02,0x8D,0xF0,0xCE,0xF5,0x1E,0x90,0x70,0x6E,0x3A};
+const char* OutputDataObjectType::ascii_fingerprint = "B33AE596EF78C48424CF96BCA5D1DF99";
+const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0xB3,0x3A,0xE5,0x96,0xEF,0x78,0xC4,0x84,0x24,0xCF,0x96,0xBC,0xA5,0xD1,0xDF,0x99};
uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -328,40 +238,14 @@ uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast3;
- xfer += iprot->readI32(ecast3);
- this->type = (DataType::type)ecast3;
+ int32_t ecast1;
+ xfer += iprot->readI32(ecast1);
+ this->type = (DataType::type)ecast1;
this->__isset.type = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast4;
- xfer += iprot->readI32(ecast4);
- this->validityType = (ValidityType::type)ecast4;
- this->__isset.validityType = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 5:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->dataMovement);
- this->__isset.dataMovement = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 6:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->dataNameLocation);
- this->__isset.dataNameLocation = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -394,21 +278,6 @@ uint32_t OutputDataObjectType::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeI32((int32_t)this->type);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.validityType) {
- xfer += oprot->writeFieldBegin("validityType", ::apache::thrift::protocol::T_I32, 4);
- xfer += oprot->writeI32((int32_t)this->validityType);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.dataMovement) {
- xfer += oprot->writeFieldBegin("dataMovement", ::apache::thrift::protocol::T_BOOL, 5);
- xfer += oprot->writeBool(this->dataMovement);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.dataNameLocation) {
- xfer += oprot->writeFieldBegin("dataNameLocation", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->dataNameLocation);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -419,14 +288,11 @@ void swap(OutputDataObjectType &a, OutputDataObjectType &b) {
swap(a.name, b.name);
swap(a.value, b.value);
swap(a.type, b.type);
- swap(a.validityType, b.validityType);
- swap(a.dataMovement, b.dataMovement);
- swap(a.dataNameLocation, b.dataNameLocation);
swap(a.__isset, b.__isset);
}
-const char* ApplicationInterfaceDescription::ascii_fingerprint = "CE1749A2DE50827990C3136E0CE4B60D";
-const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0xCE,0x17,0x49,0xA2,0xDE,0x50,0x82,0x79,0x90,0xC3,0x13,0x6E,0x0C,0xE4,0xB6,0x0D};
+const char* ApplicationInterfaceDescription::ascii_fingerprint = "355A0972969341C2A113049339427849";
+const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0x35,0x5A,0x09,0x72,0x96,0x93,0x41,0xC2,0xA1,0x13,0x04,0x93,0x39,0x42,0x78,0x49};
uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -478,14 +344,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationModules.clear();
- uint32_t _size5;
- ::apache::thrift::protocol::TType _etype8;
- xfer += iprot->readListBegin(_etype8, _size5);
- this->applicationModules.resize(_size5);
- uint32_t _i9;
- for (_i9 = 0; _i9 < _size5; ++_i9)
+ uint32_t _size2;
+ ::apache::thrift::protocol::TType _etype5;
+ xfer += iprot->readListBegin(_etype5, _size2);
+ this->applicationModules.resize(_size2);
+ uint32_t _i6;
+ for (_i6 = 0; _i6 < _size2; ++_i6)
{
- xfer += iprot->readString(this->applicationModules[_i9]);
+ xfer += iprot->readString(this->applicationModules[_i6]);
}
xfer += iprot->readListEnd();
}
@@ -498,14 +364,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationInputs.clear();
- uint32_t _size10;
- ::apache::thrift::protocol::TType _etype13;
- xfer += iprot->readListBegin(_etype13, _size10);
- this->applicationInputs.resize(_size10);
- uint32_t _i14;
- for (_i14 = 0; _i14 < _size10; ++_i14)
+ uint32_t _size7;
+ ::apache::thrift::protocol::TType _etype10;
+ xfer += iprot->readListBegin(_etype10, _size7);
+ this->applicationInputs.resize(_size7);
+ uint32_t _i11;
+ for (_i11 = 0; _i11 < _size7; ++_i11)
{
- xfer += this->applicationInputs[_i14].read(iprot);
+ xfer += this->applicationInputs[_i11].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -518,14 +384,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationOutputs.clear();
- uint32_t _size15;
- ::apache::thrift::protocol::TType _etype18;
- xfer += iprot->readListBegin(_etype18, _size15);
- this->applicationOutputs.resize(_size15);
- uint32_t _i19;
- for (_i19 = 0; _i19 < _size15; ++_i19)
+ uint32_t _size12;
+ ::apache::thrift::protocol::TType _etype15;
+ xfer += iprot->readListBegin(_etype15, _size12);
+ this->applicationOutputs.resize(_size12);
+ uint32_t _i16;
+ for (_i16 = 0; _i16 < _size12; ++_i16)
{
- xfer += this->applicationOutputs[_i19].read(iprot);
+ xfer += this->applicationOutputs[_i16].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -571,10 +437,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldBegin("applicationModules", ::apache::thrift::protocol::T_LIST, 4);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->applicationModules.size()));
- std::vector<std::string> ::const_iterator _iter20;
- for (_iter20 = this->applicationModules.begin(); _iter20 != this->applicationModules.end(); ++_iter20)
+ std::vector<std::string> ::const_iterator _iter17;
+ for (_iter17 = this->applicationModules.begin(); _iter17 != this->applicationModules.end(); ++_iter17)
{
- xfer += oprot->writeString((*_iter20));
+ xfer += oprot->writeString((*_iter17));
}
xfer += oprot->writeListEnd();
}
@@ -584,10 +450,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 5);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationInputs.size()));
- std::vector<InputDataObjectType> ::const_iterator _iter21;
- for (_iter21 = this->applicationInputs.begin(); _iter21 != this->applicationInputs.end(); ++_iter21)
+ std::vector<InputDataObjectType> ::const_iterator _iter18;
+ for (_iter18 = this->applicationInputs.begin(); _iter18 != this->applicationInputs.end(); ++_iter18)
{
- xfer += (*_iter21).write(oprot);
+ xfer += (*_iter18).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -597,10 +463,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 6);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationOutputs.size()));
- std::vector<OutputDataObjectType> ::const_iterator _iter22;
- for (_iter22 = this->applicationOutputs.begin(); _iter22 != this->applicationOutputs.end(); ++_iter22)
+ std::vector<OutputDataObjectType> ::const_iterator _iter19;
+ for (_iter19 = this->applicationOutputs.begin(); _iter19 != this->applicationOutputs.end(); ++_iter19)
{
- xfer += (*_iter22).write(oprot);
+ xfer += (*_iter19).write(oprot);
}
xfer += oprot->writeListEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
index 7a7ab52..961feea 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h
@@ -47,54 +47,23 @@ struct DataType {
extern const std::map<int, const char*> _DataType_VALUES_TO_NAMES;
-struct ValidityType {
- enum type {
- REQUIRED = 0,
- OPTIONAL = 1
- };
-};
-
-extern const std::map<int, const char*> _ValidityType_VALUES_TO_NAMES;
-
-struct CommandLineType {
- enum type {
- INCLUSIVE = 0,
- EXCLUSIVE = 1
- };
-};
-
-extern const std::map<int, const char*> _CommandLineType_VALUES_TO_NAMES;
-
-struct InputMetadataType {
- enum type {
- MEMORY = 0,
- CPU = 1
- };
-};
-
-extern const std::map<int, const char*> _InputMetadataType_VALUES_TO_NAMES;
-
typedef struct _InputDataObjectType__isset {
- _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false), inputOrder(false), inputValid(false), addedToCommandLine(false), dataStaged(true) {}
+ _InputDataObjectType__isset() : value(false), type(false), applicationArgument(false), standardInput(true), userFriendlyDescription(false), metaData(false) {}
bool value;
bool type;
bool applicationArgument;
bool standardInput;
bool userFriendlyDescription;
bool metaData;
- bool inputOrder;
- bool inputValid;
- bool addedToCommandLine;
- bool dataStaged;
} _InputDataObjectType__isset;
class InputDataObjectType {
public:
- static const char* ascii_fingerprint; // = "95DCCA621F7BE3FA34349CC6A45329DA";
- static const uint8_t binary_fingerprint[16]; // = {0x95,0xDC,0xCA,0x62,0x1F,0x7B,0xE3,0xFA,0x34,0x34,0x9C,0xC6,0xA4,0x53,0x29,0xDA};
+ static const char* ascii_fingerprint; // = "24F962C1CE4BE9FBD0F5D5EE9D1D5C00";
+ static const uint8_t binary_fingerprint[16]; // = {0x24,0xF9,0x62,0xC1,0xCE,0x4B,0xE9,0xFB,0xD0,0xF5,0xD5,0xEE,0x9D,0x1D,0x5C,0x00};
- InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData(), inputOrder(0), inputValid((ValidityType::type)0), addedToCommandLine((CommandLineType::type)0), dataStaged(false) {
+ InputDataObjectType() : name(), value(), type((DataType::type)0), applicationArgument(), standardInput(false), userFriendlyDescription(), metaData() {
}
virtual ~InputDataObjectType() throw() {}
@@ -106,10 +75,6 @@ class InputDataObjectType {
bool standardInput;
std::string userFriendlyDescription;
std::string metaData;
- int32_t inputOrder;
- ValidityType::type inputValid;
- CommandLineType::type addedToCommandLine;
- bool dataStaged;
_InputDataObjectType__isset __isset;
@@ -147,26 +112,6 @@ class InputDataObjectType {
__isset.metaData = true;
}
- void __set_inputOrder(const int32_t val) {
- inputOrder = val;
- __isset.inputOrder = true;
- }
-
- void __set_inputValid(const ValidityType::type val) {
- inputValid = val;
- __isset.inputValid = true;
- }
-
- void __set_addedToCommandLine(const CommandLineType::type val) {
- addedToCommandLine = val;
- __isset.addedToCommandLine = true;
- }
-
- void __set_dataStaged(const bool val) {
- dataStaged = val;
- __isset.dataStaged = true;
- }
-
bool operator == (const InputDataObjectType & rhs) const
{
if (!(name == rhs.name))
@@ -195,22 +140,6 @@ class InputDataObjectType {
return false;
else if (__isset.metaData && !(metaData == rhs.metaData))
return false;
- if (__isset.inputOrder != rhs.__isset.inputOrder)
- return false;
- else if (__isset.inputOrder && !(inputOrder == rhs.inputOrder))
- return false;
- if (__isset.inputValid != rhs.__isset.inputValid)
- return false;
- else if (__isset.inputValid && !(inputValid == rhs.inputValid))
- return false;
- if (__isset.addedToCommandLine != rhs.__isset.addedToCommandLine)
- return false;
- else if (__isset.addedToCommandLine && !(addedToCommandLine == rhs.addedToCommandLine))
- return false;
- if (__isset.dataStaged != rhs.__isset.dataStaged)
- return false;
- else if (__isset.dataStaged && !(dataStaged == rhs.dataStaged))
- return false;
return true;
}
bool operator != (const InputDataObjectType &rhs) const {
@@ -227,21 +156,18 @@ class InputDataObjectType {
void swap(InputDataObjectType &a, InputDataObjectType &b);
typedef struct _OutputDataObjectType__isset {
- _OutputDataObjectType__isset() : value(false), type(false), validityType(false), dataMovement(false), dataNameLocation(false) {}
+ _OutputDataObjectType__isset() : value(false), type(false) {}
bool value;
bool type;
- bool validityType;
- bool dataMovement;
- bool dataNameLocation;
} _OutputDataObjectType__isset;
class OutputDataObjectType {
public:
- static const char* ascii_fingerprint; // = "9B8C3AEA43A2028DF0CEF51E90706E3A";
- static const uint8_t binary_fingerprint[16]; // = {0x9B,0x8C,0x3A,0xEA,0x43,0xA2,0x02,0x8D,0xF0,0xCE,0xF5,0x1E,0x90,0x70,0x6E,0x3A};
+ static const char* ascii_fingerprint; // = "B33AE596EF78C48424CF96BCA5D1DF99";
+ static const uint8_t binary_fingerprint[16]; // = {0xB3,0x3A,0xE5,0x96,0xEF,0x78,0xC4,0x84,0x24,0xCF,0x96,0xBC,0xA5,0xD1,0xDF,0x99};
- OutputDataObjectType() : name(), value(), type((DataType::type)0), validityType((ValidityType::type)0), dataMovement(0), dataNameLocation() {
+ OutputDataObjectType() : name(), value(), type((DataType::type)0) {
}
virtual ~OutputDataObjectType() throw() {}
@@ -249,9 +175,6 @@ class OutputDataObjectType {
std::string name;
std::string value;
DataType::type type;
- ValidityType::type validityType;
- bool dataMovement;
- std::string dataNameLocation;
_OutputDataObjectType__isset __isset;
@@ -269,21 +192,6 @@ class OutputDataObjectType {
__isset.type = true;
}
- void __set_validityType(const ValidityType::type val) {
- validityType = val;
- __isset.validityType = true;
- }
-
- void __set_dataMovement(const bool val) {
- dataMovement = val;
- __isset.dataMovement = true;
- }
-
- void __set_dataNameLocation(const std::string& val) {
- dataNameLocation = val;
- __isset.dataNameLocation = true;
- }
-
bool operator == (const OutputDataObjectType & rhs) const
{
if (!(name == rhs.name))
@@ -296,18 +204,6 @@ class OutputDataObjectType {
return false;
else if (__isset.type && !(type == rhs.type))
return false;
- if (__isset.validityType != rhs.__isset.validityType)
- return false;
- else if (__isset.validityType && !(validityType == rhs.validityType))
- return false;
- if (__isset.dataMovement != rhs.__isset.dataMovement)
- return false;
- else if (__isset.dataMovement && !(dataMovement == rhs.dataMovement))
- return false;
- if (__isset.dataNameLocation != rhs.__isset.dataNameLocation)
- return false;
- else if (__isset.dataNameLocation && !(dataNameLocation == rhs.dataNameLocation))
- return false;
return true;
}
bool operator != (const OutputDataObjectType &rhs) const {
@@ -334,8 +230,8 @@ typedef struct _ApplicationInterfaceDescription__isset {
class ApplicationInterfaceDescription {
public:
- static const char* ascii_fingerprint; // = "CE1749A2DE50827990C3136E0CE4B60D";
- static const uint8_t binary_fingerprint[16]; // = {0xCE,0x17,0x49,0xA2,0xDE,0x50,0x82,0x79,0x90,0xC3,0x13,0x6E,0x0C,0xE4,0xB6,0x0D};
+ static const char* ascii_fingerprint; // = "355A0972969341C2A113049339427849";
+ static const uint8_t binary_fingerprint[16]; // = {0x35,0x5A,0x09,0x72,0x96,0x93,0x41,0xC2,0xA1,0x13,0x04,0x93,0x39,0x42,0x78,0x49};
ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription() {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
index 0d92089..18a2674 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp
@@ -1843,8 +1843,8 @@ void swap(DataTransferDetails &a, DataTransferDetails &b) {
swap(a.__isset, b.__isset);
}
-const char* TaskDetails::ascii_fingerprint = "09A94E3E2FA720626BDA3CA7ADC1CB70";
-const uint8_t TaskDetails::binary_fingerprint[16] = {0x09,0xA9,0x4E,0x3E,0x2F,0xA7,0x20,0x62,0x6B,0xDA,0x3C,0xA7,0xAD,0xC1,0xCB,0x70};
+const char* TaskDetails::ascii_fingerprint = "C0E50EB91BEBDC23A45D03BFD2BD630A";
+const uint8_t TaskDetails::binary_fingerprint[16] = {0xC0,0xE5,0x0E,0xB9,0x1B,0xEB,0xDC,0x23,0xA4,0x5D,0x03,0xBF,0xD2,0xBD,0x63,0x0A};
uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -2190,8 +2190,8 @@ void swap(TaskDetails &a, TaskDetails &b) {
swap(a.__isset, b.__isset);
}
-const char* WorkflowNodeDetails::ascii_fingerprint = "851CFB79378E39B6C03385F9272B8A93";
-const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x85,0x1C,0xFB,0x79,0x37,0x8E,0x39,0xB6,0xC0,0x33,0x85,0xF9,0x27,0x2B,0x8A,0x93};
+const char* WorkflowNodeDetails::ascii_fingerprint = "F9600D5A8E84EAF65A64E38C18DFACAE";
+const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0xF9,0x60,0x0D,0x5A,0x8E,0x84,0xEA,0xF6,0x5A,0x64,0xE3,0x8C,0x18,0xDF,0xAC,0xAE};
uint32_t WorkflowNodeDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -2646,8 +2646,8 @@ void swap(ValidationResults &a, ValidationResults &b) {
swap(a.validationResultList, b.validationResultList);
}
-const char* Experiment::ascii_fingerprint = "1390A2E18FD8CF984CDDD4E167ED1E67";
-const uint8_t Experiment::binary_fingerprint[16] = {0x13,0x90,0xA2,0xE1,0x8F,0xD8,0xCF,0x98,0x4C,0xDD,0xD4,0xE1,0x67,0xED,0x1E,0x67};
+const char* Experiment::ascii_fingerprint = "CDFB79AEABF988D5D38D8EEAEEBECC6F";
+const uint8_t Experiment::binary_fingerprint[16] = {0xCD,0xFB,0x79,0xAE,0xAB,0xF9,0x88,0xD5,0xD3,0x8D,0x8E,0xEA,0xEE,0xBE,0xCC,0x6F};
uint32_t Experiment::read(::apache::thrift::protocol::TProtocol* iprot) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
index 80701b5..c4edbb7 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h
@@ -1294,8 +1294,8 @@ typedef struct _TaskDetails__isset {
class TaskDetails {
public:
- static const char* ascii_fingerprint; // = "09A94E3E2FA720626BDA3CA7ADC1CB70";
- static const uint8_t binary_fingerprint[16]; // = {0x09,0xA9,0x4E,0x3E,0x2F,0xA7,0x20,0x62,0x6B,0xDA,0x3C,0xA7,0xAD,0xC1,0xCB,0x70};
+ static const char* ascii_fingerprint; // = "C0E50EB91BEBDC23A45D03BFD2BD630A";
+ static const uint8_t binary_fingerprint[16]; // = {0xC0,0xE5,0x0E,0xB9,0x1B,0xEB,0xDC,0x23,0xA4,0x5D,0x03,0xBF,0xD2,0xBD,0x63,0x0A};
TaskDetails() : taskID("DO_NOT_SET_AT_CLIENTS"), creationTime(0), applicationId(), applicationVersion(), applicationDeploymentId() {
}
@@ -1473,8 +1473,8 @@ typedef struct _WorkflowNodeDetails__isset {
class WorkflowNodeDetails {
public:
- static const char* ascii_fingerprint; // = "851CFB79378E39B6C03385F9272B8A93";
- static const uint8_t binary_fingerprint[16]; // = {0x85,0x1C,0xFB,0x79,0x37,0x8E,0x39,0xB6,0xC0,0x33,0x85,0xF9,0x27,0x2B,0x8A,0x93};
+ static const char* ascii_fingerprint; // = "F9600D5A8E84EAF65A64E38C18DFACAE";
+ static const uint8_t binary_fingerprint[16]; // = {0xF9,0x60,0x0D,0x5A,0x8E,0x84,0xEA,0xF6,0x5A,0x64,0xE3,0x8C,0x18,0xDF,0xAC,0xAE};
WorkflowNodeDetails() : nodeInstanceId("DO_NOT_SET_AT_CLIENTS"), creationTime(0), nodeName("SINGLE_APP_NODE"), executionUnit((ExecutionUnit::type)1), executionUnitData() {
executionUnit = (ExecutionUnit::type)1;
@@ -1712,8 +1712,8 @@ typedef struct _Experiment__isset {
class Experiment {
public:
- static const char* ascii_fingerprint; // = "1390A2E18FD8CF984CDDD4E167ED1E67";
- static const uint8_t binary_fingerprint[16]; // = {0x13,0x90,0xA2,0xE1,0x8F,0xD8,0xCF,0x98,0x4C,0xDD,0xD4,0xE1,0x67,0xED,0x1E,0x67};
+ static const char* ascii_fingerprint; // = "CDFB79AEABF988D5D38D8EEAEEBECC6F";
+ static const uint8_t binary_fingerprint[16]; // = {0xCD,0xFB,0x79,0xAE,0xAB,0xF9,0x88,0xD5,0xD3,0x8D,0x8E,0xEA,0xEE,0xBE,0xCC,0x6F};
Experiment() : experimentID("DO_NOT_SET_AT_CLIENTS"), projectID("DEFAULT"), creationTime(0), userName(), name(), description(), applicationId(), applicationVersion(), workflowTemplateId(), workflowTemplateVersion(), workflowExecutionInstanceId() {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
index 2297e40..4bfd1bc 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp
@@ -607,8 +607,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b) {
swap(a.taskIdentity, b.taskIdentity);
}
-const char* TaskOutputChangeEvent::ascii_fingerprint = "CD10AFEB7332120253CE0C3FFCF54C48";
-const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xCD,0x10,0xAF,0xEB,0x73,0x32,0x12,0x02,0x53,0xCE,0x0C,0x3F,0xFC,0xF5,0x4C,0x48};
+const char* TaskOutputChangeEvent::ascii_fingerprint = "850570A8E8883AE24DE92AFC9AA86C7E";
+const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0x85,0x05,0x70,0xA8,0xE8,0x88,0x3A,0xE2,0x4D,0xE9,0x2A,0xFC,0x9A,0xA8,0x6C,0x7E};
uint32_t TaskOutputChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
index 3596539..61dc55f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h
@@ -354,8 +354,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b);
class TaskOutputChangeEvent {
public:
- static const char* ascii_fingerprint; // = "CD10AFEB7332120253CE0C3FFCF54C48";
- static const uint8_t binary_fingerprint[16]; // = {0xCD,0x10,0xAF,0xEB,0x73,0x32,0x12,0x02,0x53,0xCE,0x0C,0x3F,0xFC,0xF5,0x4C,0x48};
+ static const char* ascii_fingerprint; // = "850570A8E8883AE24DE92AFC9AA86C7E";
+ static const uint8_t binary_fingerprint[16]; // = {0x85,0x05,0x70,0xA8,0xE8,0x88,0x3A,0xE2,0x4D,0xE9,0x2A,0xFC,0x9A,0xA8,0x6C,0x7E};
TaskOutputChangeEvent() {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
index cffa250..53f0b70 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp
@@ -27,8 +27,8 @@
-const char* Workflow::ascii_fingerprint = "4320FCC5DE6949377139919B68E7F5C1";
-const uint8_t Workflow::binary_fingerprint[16] = {0x43,0x20,0xFC,0xC5,0xDE,0x69,0x49,0x37,0x71,0x39,0x91,0x9B,0x68,0xE7,0xF5,0xC1};
+const char* Workflow::ascii_fingerprint = "0F4DE03295CE4C20055DE0E68CFA7A65";
+const uint8_t Workflow::binary_fingerprint[16] = {0x0F,0x4D,0xE0,0x32,0x95,0xCE,0x4C,0x20,0x05,0x5D,0xE0,0xE6,0x8C,0xFA,0x7A,0x65};
uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
index b46858d..d688702 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h
@@ -46,8 +46,8 @@ typedef struct _Workflow__isset {
class Workflow {
public:
- static const char* ascii_fingerprint; // = "4320FCC5DE6949377139919B68E7F5C1";
- static const uint8_t binary_fingerprint[16]; // = {0x43,0x20,0xFC,0xC5,0xDE,0x69,0x49,0x37,0x71,0x39,0x91,0x9B,0x68,0xE7,0xF5,0xC1};
+ static const char* ascii_fingerprint; // = "0F4DE03295CE4C20055DE0E68CFA7A65";
+ static const uint8_t binary_fingerprint[16]; // = {0x0F,0x4D,0xE0,0x32,0x95,0xCE,0x4C,0x20,0x05,0x5D,0xE0,0xE6,0x8C,0xFA,0x7A,0x65};
Workflow() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), image() {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
index 4983eb2..5350e10 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -34,33 +34,6 @@ final class DataType {
);
}
-final class ValidityType {
- const REQUIRED = 0;
- const OPTIONAL = 1;
- static public $__names = array(
- 0 => 'REQUIRED',
- 1 => 'OPTIONAL',
- );
-}
-
-final class CommandLineType {
- const INCLUSIVE = 0;
- const EXCLUSIVE = 1;
- static public $__names = array(
- 0 => 'INCLUSIVE',
- 1 => 'EXCLUSIVE',
- );
-}
-
-final class InputMetadataType {
- const MEMORY = 0;
- const CPU = 1;
- static public $__names = array(
- 0 => 'MEMORY',
- 1 => 'CPU',
- );
-}
-
class InputDataObjectType {
static $_TSPEC;
@@ -71,10 +44,6 @@ class InputDataObjectType {
public $standardInput = false;
public $userFriendlyDescription = null;
public $metaData = null;
- public $inputOrder = null;
- public $inputValid = null;
- public $addedToCommandLine = null;
- public $dataStaged = false;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -107,22 +76,6 @@ class InputDataObjectType {
'var' => 'metaData',
'type' => TType::STRING,
),
- 8 => array(
- 'var' => 'inputOrder',
- 'type' => TType::I32,
- ),
- 9 => array(
- 'var' => 'inputValid',
- 'type' => TType::I32,
- ),
- 10 => array(
- 'var' => 'addedToCommandLine',
- 'type' => TType::I32,
- ),
- 11 => array(
- 'var' => 'dataStaged',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -147,18 +100,6 @@ class InputDataObjectType {
if (isset($vals['metaData'])) {
$this->metaData = $vals['metaData'];
}
- if (isset($vals['inputOrder'])) {
- $this->inputOrder = $vals['inputOrder'];
- }
- if (isset($vals['inputValid'])) {
- $this->inputValid = $vals['inputValid'];
- }
- if (isset($vals['addedToCommandLine'])) {
- $this->addedToCommandLine = $vals['addedToCommandLine'];
- }
- if (isset($vals['dataStaged'])) {
- $this->dataStaged = $vals['dataStaged'];
- }
}
}
@@ -230,34 +171,6 @@ class InputDataObjectType {
$xfer += $input->skip($ftype);
}
break;
- case 8:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->inputOrder);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 9:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->inputValid);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 10:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->addedToCommandLine);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 11:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->dataStaged);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -306,26 +219,6 @@ class InputDataObjectType {
$xfer += $output->writeString($this->metaData);
$xfer += $output->writeFieldEnd();
}
- if ($this->inputOrder !== null) {
- $xfer += $output->writeFieldBegin('inputOrder', TType::I32, 8);
- $xfer += $output->writeI32($this->inputOrder);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->inputValid !== null) {
- $xfer += $output->writeFieldBegin('inputValid', TType::I32, 9);
- $xfer += $output->writeI32($this->inputValid);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->addedToCommandLine !== null) {
- $xfer += $output->writeFieldBegin('addedToCommandLine', TType::I32, 10);
- $xfer += $output->writeI32($this->addedToCommandLine);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataStaged !== null) {
- $xfer += $output->writeFieldBegin('dataStaged', TType::BOOL, 11);
- $xfer += $output->writeBool($this->dataStaged);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -339,9 +232,6 @@ class OutputDataObjectType {
public $name = null;
public $value = null;
public $type = null;
- public $validityType = null;
- public $dataMovement = null;
- public $dataNameLocation = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -358,18 +248,6 @@ class OutputDataObjectType {
'var' => 'type',
'type' => TType::I32,
),
- 4 => array(
- 'var' => 'validityType',
- 'type' => TType::I32,
- ),
- 5 => array(
- 'var' => 'dataMovement',
- 'type' => TType::BOOL,
- ),
- 6 => array(
- 'var' => 'dataNameLocation',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -382,15 +260,6 @@ class OutputDataObjectType {
if (isset($vals['type'])) {
$this->type = $vals['type'];
}
- if (isset($vals['validityType'])) {
- $this->validityType = $vals['validityType'];
- }
- if (isset($vals['dataMovement'])) {
- $this->dataMovement = $vals['dataMovement'];
- }
- if (isset($vals['dataNameLocation'])) {
- $this->dataNameLocation = $vals['dataNameLocation'];
- }
}
}
@@ -434,27 +303,6 @@ class OutputDataObjectType {
$xfer += $input->skip($ftype);
}
break;
- case 4:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->validityType);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->dataMovement);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataNameLocation);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -483,21 +331,6 @@ class OutputDataObjectType {
$xfer += $output->writeI32($this->type);
$xfer += $output->writeFieldEnd();
}
- if ($this->validityType !== null) {
- $xfer += $output->writeFieldBegin('validityType', TType::I32, 4);
- $xfer += $output->writeI32($this->validityType);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataMovement !== null) {
- $xfer += $output->writeFieldBegin('dataMovement', TType::BOOL, 5);
- $xfer += $output->writeBool($this->dataMovement);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataNameLocation !== null) {
- $xfer += $output->writeFieldBegin('dataNameLocation', TType::STRING, 6);
- $xfer += $output->writeString($this->dataNameLocation);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
index 28f01f5..1fa62ab 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
@@ -176,7 +176,7 @@ public class RegisterSampleData {
appModules.add(echoModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World",
- DataType.STRING, null, 1, false, "A test string to Echo", null);
+ DataType.STRING, null, false, "A test string to Echo", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -205,9 +205,9 @@ public class RegisterSampleData {
appModules.add(addModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "2",
- DataType.STRING, null, 1, false, "Add operation input_1", null);
+ DataType.STRING, null, false, "Add operation input_1", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "3",
- DataType.STRING, null, 2, false, "Add operation input_2", null);
+ DataType.STRING, null, false, "Add operation input_2", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -237,9 +237,9 @@ public class RegisterSampleData {
appModules.add(multiplyModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "4",
- DataType.STRING, null, 1, false, "Multiply operation input_1", null);
+ DataType.STRING, null, false, "Multiply operation input_1", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "5",
- DataType.STRING, null, 2, false, "Multiply operation input_2", null);
+ DataType.STRING, null, false, "Multiply operation input_2", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -269,9 +269,9 @@ public class RegisterSampleData {
appModules.add(subtractModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "6",
- DataType.STRING, null, 1, false, "Subtract operation input_1", null);
+ DataType.STRING, null, false, "Subtract operation input_1", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "7",
- DataType.STRING, null, 2, false, "Subtract operation input_2", null);
+ DataType.STRING, null, false, "Subtract operation input_2", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
index 9ba0b4b..2b7c195 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
@@ -154,7 +154,7 @@ public class RegisterOGCEUS3Application {
appModules.add(ultrascanModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null,
- DataType.URI, null, 1, false, "input tar file", null);
+ DataType.URI, null, false, "input tar file", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index 18408b7..9a2aaf7 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -370,7 +370,7 @@ public class RegisterSampleApplications {
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("s_struct", "",
- DataType.URI, null, 1, false, "Starting Structure File", null));
+ DataType.URI, null, false, "Starting Structure File", null));
List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
@@ -387,11 +387,11 @@ public class RegisterSampleApplications {
applicationInputs.clear();
applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("ffcomplient_struct", "",
- DataType.URI, null, 1, false, "FFComplient Structure File", null));
+ DataType.URI, null, false, "FFComplient Structure File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology", "",
- DataType.URI, null, 2, false, "Topology File", null));
+ DataType.URI, null, false, "Topology File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("control_param_emv", "",
- DataType.URI, null, 3, false, "Controlled parameters array of EM Vacuum", null));
+ DataType.URI, null, false, "Controlled parameters array of EM Vacuum", null));
applicationOutputs.clear();
@@ -406,7 +406,7 @@ public class RegisterSampleApplications {
applicationInputs.clear();
applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("energy_min_struct", "",
- DataType.URI, null, 1, false, "Energy Minimized Structure File", null));
+ DataType.URI, null, false, "Energy Minimized Structure File", null));
applicationOutputs.clear();
applicationOutputs = new ArrayList<OutputDataObjectType>();
@@ -420,11 +420,11 @@ public class RegisterSampleApplications {
applicationInputs.clear();
applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("struct_with_pbc", "",
- DataType.URI, null, 1, false, "Structure with PBC File", null));
+ DataType.URI, null, false, "Structure with PBC File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("solvent_struct", "",
- DataType.URI, null, 2, false, "Solvent Structure File", null));
+ DataType.URI, null, false, "Solvent Structure File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology", "",
- DataType.URI, null, 3, false, "Topology File", null));
+ DataType.URI, null, false, "Topology File", null));
applicationOutputs.clear();
applicationOutputs = new ArrayList<OutputDataObjectType>();
@@ -441,11 +441,11 @@ public class RegisterSampleApplications {
applicationInputs.clear();
applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("struct_with_water", "",
- DataType.URI, null, 1, false, "Structure with water File", null));
+ DataType.URI, null, false, "Structure with water File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology_with_water", "",
- DataType.URI, null, 2, false, "Topology including water File", null));
+ DataType.URI, null, false, "Topology including water File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("control_param_emv", "",
- DataType.URI, null, 3, false, "Controlled parameters array of EM Vacuum", null));
+ DataType.URI, null, false, "Controlled parameters array of EM Vacuum", null));
applicationOutputs.clear();
applicationOutputs = new ArrayList<OutputDataObjectType>();
@@ -459,9 +459,9 @@ public class RegisterSampleApplications {
applicationInputs.clear();
applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("struct_topoogy", "",
- DataType.URI, null, 1, false, "Structure and Topology File", null));
+ DataType.URI, null, false, "Structure and Topology File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("topology_with_water", "",
- DataType.URI, null, 2, false, "Topology including water File", null));
+ DataType.URI, null, false, "Topology including water File", null));
applicationOutputs.clear();
applicationOutputs = new ArrayList<OutputDataObjectType>();
@@ -478,11 +478,11 @@ public class RegisterSampleApplications {
applicationInputs.clear();
applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("sys_topoogy", "",
- DataType.URI, null, 1, false, "Structure and Topology File", null));
+ DataType.URI, null, false, "Structure and Topology File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("sys_config", "",
- DataType.URI, null, 2, false, "Topology including water File", null));
+ DataType.URI, null, false, "Topology including water File", null));
applicationInputs.add(RegisterSampleApplicationsUtils.createAppInput("control_param_ems", "",
- DataType.URI, null, 3, false, "Controlled parameters array of EM Solvent", null));
+ DataType.URI, null, false, "Controlled parameters array of EM Solvent", null));
applicationOutputs.clear();
applicationOutputs = new ArrayList<OutputDataObjectType>();
@@ -508,7 +508,7 @@ public class RegisterSampleApplications {
appModules.add(echoModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("echo_input", "echo_output=Hello World",
- DataType.STRING, null, 1, false, "A test string to Echo", null);
+ DataType.STRING, null, false, "A test string to Echo", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -536,19 +536,18 @@ public class RegisterSampleApplications {
List<String> appModules = new ArrayList<String>();
appModules.add(echoModuleId);
-
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "",
- DataType.STRING, null, 1, false, "A test string to Echo", null);
+ DataType.STRING, null, false, "A test string to Echo", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo2", "",
- DataType.URI, null, 2, false, "A sample input remote file", null);
+ DataType.URI, null, false, "A sample input remote file", null);
InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo3", "file:///tmp/test.txt",
- DataType.URI, null, 3, false, "A sample input local file", null);
+ DataType.URI, null, false, "A sample input local file", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
- applicationInputs.add(input1); applicationInputs.add(input2); applicationInputs.add(input3);
+ applicationInputs.add(input1);
OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
"", DataType.STRING);
@@ -576,7 +575,7 @@ public class RegisterSampleApplications {
appModules.add(mpiModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Sample_Input", "",
- DataType.STRING, null, 1, false, "An optional MPI source file", null);
+ DataType.STRING, null, false, "An optional MPI source file", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -607,13 +606,13 @@ public class RegisterSampleApplications {
appModules.add(amberModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Heat_Restart_File", null,
- DataType.URI, null, 1, false, "Heating up the system equilibration stage - 02_Heat.rst", null);
+ DataType.URI, null, false, "Heating up the system equilibration stage - 02_Heat.rst", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Production_Control_File", null,
- DataType.URI, null, 2, false, "Constant pressure and temperature for production stage - 03_Prod.in", null);
+ DataType.URI, null, false, "Constant pressure and temperature for production stage - 03_Prod.in", null);
InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Parameter_Topology_File", null,
- DataType.URI, null, 3, false, "Parameter and Topology coordinates - prmtop", null);
+ DataType.URI, null, false, "Parameter and Topology coordinates - prmtop", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -649,13 +648,13 @@ public class RegisterSampleApplications {
appModules.add(autoDockModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Heat_Restart_File", null,
- DataType.URI, null, 1, false, "Heating up the system equilibration stage", null);
+ DataType.URI, null, false, "Heating up the system equilibration stage", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Production_Control_File", null,
- DataType.URI, null, 2, false, "Constant pressure and temperature for production stage", null);
+ DataType.URI, null, false, "Constant pressure and temperature for production stage", null);
InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Parameter_Topology_File", null,
- DataType.URI, null, 3, false, "Parameter and Topology coordinates", null);
+ DataType.URI, null, false, "Parameter and Topology coordinates", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -686,10 +685,10 @@ public class RegisterSampleApplications {
appModules.add(espressoModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("AI_Primitive_Cell", null,
- DataType.URI, null, 1, false, "AI_Metal_Input_File - Al.sample.in", null);
+ DataType.URI, null, false, "AI_Metal_Input_File - Al.sample.in", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("AI_Pseudopotential_File", null,
- DataType.URI, null, 2, false, "Constant pressure and temperature for production stage - Al.pz-vbc.UPF", null);
+ DataType.URI, null, false, "Constant pressure and temperature for production stage - Al.pz-vbc.UPF", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -720,10 +719,10 @@ public class RegisterSampleApplications {
appModules.add(gromacsModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Portable_Input_Binary_File", null,
- DataType.URI, null, 1, false, "Coordinates velocities, molecular topology and simulation parameters - pdb1y6l-EM-vacuum.tpr", null);
+ DataType.URI, null, false, "Coordinates velocities, molecular topology and simulation parameters - pdb1y6l-EM-vacuum.tpr", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("GROMOS_Coordinate_File", null,
- DataType.URI, null, 2, false, "Trajectory Coordinates Molecular Structure in Gromos87 format - pdb1y6l-EM-vacuum.gro", null);
+ DataType.URI, null, false, "Trajectory Coordinates Molecular Structure in Gromos87 format - pdb1y6l-EM-vacuum.gro", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -756,7 +755,7 @@ public class RegisterSampleApplications {
appModules.add(lammpsModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Friction_Simulation_Input", null,
- DataType.URI, null, 1, false, "Friction Simulation Input - in.friction", null);
+ DataType.URI, null, false, "Friction Simulation Input - in.friction", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -784,7 +783,7 @@ public class RegisterSampleApplications {
appModules.add(nwChemModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Water_Molecule_Input", null,
- DataType.URI, null, 1, false, "Water Molecule Input File - water.nw", null);
+ DataType.URI, null, false, "Water Molecule Input File - water.nw", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -813,10 +812,10 @@ public class RegisterSampleApplications {
appModules.add(trinityModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("RNA_Seq_Left_Input", null,
- DataType.URI, null, 1, false, "RNA-Seq Left Library - reads.left.fq", null);
+ DataType.URI, null, false, "RNA-Seq Left Library - reads.left.fq", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("RNA_Seq_Right_Input", null,
- DataType.URI, null, 2, false, "RNA-Seq Right Library - reads.right.fq", null);
+ DataType.URI, null, false, "RNA-Seq Right Library - reads.right.fq", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -848,13 +847,13 @@ public class RegisterSampleApplications {
appModules.add(wrfModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Config_Namelist_File", null,
- DataType.URI, null, 1, false, "Namelist Configuration File - namelist.input", null);
+ DataType.URI, null, false, "Namelist Configuration File - namelist.input", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("WRF_Initial_Conditions", null,
- DataType.URI, null, 2, false, "Initial Conditions File - wrfinput_d01", null);
+ DataType.URI, null, false, "Initial Conditions File - wrfinput_d01", null);
InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("WRF_Boundary_File", null,
- DataType.URI, null, 3, false, "Boundary Conditions File - wrfbdy_d01", null);
+ DataType.URI, null, false, "Boundary Conditions File - wrfbdy_d01", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -889,13 +888,13 @@ public class RegisterSampleApplications {
appModules.add(phastaModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Parasolid_Geometric_Model", null,
- DataType.URI, null, 1, false, "Parasolid geometric model - geom.xmt_txt", null);
+ DataType.URI, null, false, "Parasolid geometric model - geom.xmt_txt", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Problem_Definition", null,
- DataType.URI, null, 2, false, "problem definition - geom.smd", null);
+ DataType.URI, null, false, "problem definition - geom.smd", null);
InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Mesh_Description_File", null,
- DataType.URI, null, 3, false, "Mesh Description - geom.sms", null);
+ DataType.URI, null, false, "Mesh Description - geom.sms", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
index 58ba387..34f770a 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
@@ -120,14 +120,13 @@ public class RegisterSampleApplicationsUtils {
public static InputDataObjectType createAppInput
(String inputName, String value, DataType type,
- String applicationArgument, int order, boolean stdIn, String description, String metadata) {
+ String applicationArgument, boolean stdIn, String description, String metadata) {
InputDataObjectType input = new InputDataObjectType();
// input.setIsEmpty(false);
if (inputName != null) input.setName(inputName);
if (value != null) input.setValue(value);
if (type != null) input.setType(type);
if (applicationArgument != null) input.setApplicationArgument(applicationArgument);
- input.setInputOrder(order);
if (description != null) input.setUserFriendlyDescription(description);
input.setStandardInput(stdIn);
if (metadata != null) input.setMetaData(metadata);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
index 0e86469..ccb4e24 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
@@ -154,7 +154,7 @@ public class RegisterUS3Application {
appModules.add(ultrascanModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null,
- DataType.URI, null, 1, false, "input tar file", null);
+ DataType.URI, null, false, "input tar file", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
[3/4] airavata git commit: Revert "Merge branch 'master' of"
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
index 8ab0b46..97227b8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java
@@ -85,10 +85,6 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField STANDARD_INPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("standardInput", org.apache.thrift.protocol.TType.BOOL, (short)5);
private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField INPUT_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("inputOrder", org.apache.thrift.protocol.TType.I32, (short)8);
- private static final org.apache.thrift.protocol.TField INPUT_VALID_FIELD_DESC = new org.apache.thrift.protocol.TField("inputValid", org.apache.thrift.protocol.TType.I32, (short)9);
- private static final org.apache.thrift.protocol.TField ADDED_TO_COMMAND_LINE_FIELD_DESC = new org.apache.thrift.protocol.TField("addedToCommandLine", org.apache.thrift.protocol.TType.I32, (short)10);
- private static final org.apache.thrift.protocol.TField DATA_STAGED_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStaged", org.apache.thrift.protocol.TType.BOOL, (short)11);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -103,10 +99,6 @@ import org.slf4j.LoggerFactory;
private boolean standardInput; // optional
private String userFriendlyDescription; // optional
private String metaData; // optional
- private int inputOrder; // optional
- private ValidityType inputValid; // optional
- private CommandLineType addedToCommandLine; // optional
- private boolean dataStaged; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -120,19 +112,7 @@ import org.slf4j.LoggerFactory;
APPLICATION_ARGUMENT((short)4, "applicationArgument"),
STANDARD_INPUT((short)5, "standardInput"),
USER_FRIENDLY_DESCRIPTION((short)6, "userFriendlyDescription"),
- META_DATA((short)7, "metaData"),
- INPUT_ORDER((short)8, "inputOrder"),
- /**
- *
- * @see ValidityType
- */
- INPUT_VALID((short)9, "inputValid"),
- /**
- *
- * @see CommandLineType
- */
- ADDED_TO_COMMAND_LINE((short)10, "addedToCommandLine"),
- DATA_STAGED((short)11, "dataStaged");
+ META_DATA((short)7, "metaData");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -161,14 +141,6 @@ import org.slf4j.LoggerFactory;
return USER_FRIENDLY_DESCRIPTION;
case 7: // META_DATA
return META_DATA;
- case 8: // INPUT_ORDER
- return INPUT_ORDER;
- case 9: // INPUT_VALID
- return INPUT_VALID;
- case 10: // ADDED_TO_COMMAND_LINE
- return ADDED_TO_COMMAND_LINE;
- case 11: // DATA_STAGED
- return DATA_STAGED;
default:
return null;
}
@@ -210,10 +182,8 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __STANDARDINPUT_ISSET_ID = 0;
- private static final int __INPUTORDER_ISSET_ID = 1;
- private static final int __DATASTAGED_ISSET_ID = 2;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA,_Fields.INPUT_ORDER,_Fields.INPUT_VALID,_Fields.ADDED_TO_COMMAND_LINE,_Fields.DATA_STAGED};
+ private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -231,14 +201,6 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.META_DATA, new org.apache.thrift.meta_data.FieldMetaData("metaData", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.INPUT_ORDER, new org.apache.thrift.meta_data.FieldMetaData("inputOrder", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.INPUT_VALID, new org.apache.thrift.meta_data.FieldMetaData("inputValid", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ValidityType.class)));
- tmpMap.put(_Fields.ADDED_TO_COMMAND_LINE, new org.apache.thrift.meta_data.FieldMetaData("addedToCommandLine", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, CommandLineType.class)));
- tmpMap.put(_Fields.DATA_STAGED, new org.apache.thrift.meta_data.FieldMetaData("dataStaged", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InputDataObjectType.class, metaDataMap);
}
@@ -246,8 +208,6 @@ import org.slf4j.LoggerFactory;
public InputDataObjectType() {
this.standardInput = false;
- this.dataStaged = false;
-
}
public InputDataObjectType(
@@ -281,14 +241,6 @@ import org.slf4j.LoggerFactory;
if (other.isSetMetaData()) {
this.metaData = other.metaData;
}
- this.inputOrder = other.inputOrder;
- if (other.isSetInputValid()) {
- this.inputValid = other.inputValid;
- }
- if (other.isSetAddedToCommandLine()) {
- this.addedToCommandLine = other.addedToCommandLine;
- }
- this.dataStaged = other.dataStaged;
}
public InputDataObjectType deepCopy() {
@@ -305,12 +257,6 @@ import org.slf4j.LoggerFactory;
this.userFriendlyDescription = null;
this.metaData = null;
- setInputOrderIsSet(false);
- this.inputOrder = 0;
- this.inputValid = null;
- this.addedToCommandLine = null;
- this.dataStaged = false;
-
}
public String getName() {
@@ -481,112 +427,6 @@ import org.slf4j.LoggerFactory;
}
}
- public int getInputOrder() {
- return this.inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- setInputOrderIsSet(true);
- }
-
- public void unsetInputOrder() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INPUTORDER_ISSET_ID);
- }
-
- /** Returns true if field inputOrder is set (has been assigned a value) and false otherwise */
- public boolean isSetInputOrder() {
- return EncodingUtils.testBit(__isset_bitfield, __INPUTORDER_ISSET_ID);
- }
-
- public void setInputOrderIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INPUTORDER_ISSET_ID, value);
- }
-
- /**
- *
- * @see ValidityType
- */
- public ValidityType getInputValid() {
- return this.inputValid;
- }
-
- /**
- *
- * @see ValidityType
- */
- public void setInputValid(ValidityType inputValid) {
- this.inputValid = inputValid;
- }
-
- public void unsetInputValid() {
- this.inputValid = null;
- }
-
- /** Returns true if field inputValid is set (has been assigned a value) and false otherwise */
- public boolean isSetInputValid() {
- return this.inputValid != null;
- }
-
- public void setInputValidIsSet(boolean value) {
- if (!value) {
- this.inputValid = null;
- }
- }
-
- /**
- *
- * @see CommandLineType
- */
- public CommandLineType getAddedToCommandLine() {
- return this.addedToCommandLine;
- }
-
- /**
- *
- * @see CommandLineType
- */
- public void setAddedToCommandLine(CommandLineType addedToCommandLine) {
- this.addedToCommandLine = addedToCommandLine;
- }
-
- public void unsetAddedToCommandLine() {
- this.addedToCommandLine = null;
- }
-
- /** Returns true if field addedToCommandLine is set (has been assigned a value) and false otherwise */
- public boolean isSetAddedToCommandLine() {
- return this.addedToCommandLine != null;
- }
-
- public void setAddedToCommandLineIsSet(boolean value) {
- if (!value) {
- this.addedToCommandLine = null;
- }
- }
-
- public boolean isDataStaged() {
- return this.dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- setDataStagedIsSet(true);
- }
-
- public void unsetDataStaged() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DATASTAGED_ISSET_ID);
- }
-
- /** Returns true if field dataStaged is set (has been assigned a value) and false otherwise */
- public boolean isSetDataStaged() {
- return EncodingUtils.testBit(__isset_bitfield, __DATASTAGED_ISSET_ID);
- }
-
- public void setDataStagedIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DATASTAGED_ISSET_ID, value);
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case NAME:
@@ -645,38 +485,6 @@ import org.slf4j.LoggerFactory;
}
break;
- case INPUT_ORDER:
- if (value == null) {
- unsetInputOrder();
- } else {
- setInputOrder((Integer)value);
- }
- break;
-
- case INPUT_VALID:
- if (value == null) {
- unsetInputValid();
- } else {
- setInputValid((ValidityType)value);
- }
- break;
-
- case ADDED_TO_COMMAND_LINE:
- if (value == null) {
- unsetAddedToCommandLine();
- } else {
- setAddedToCommandLine((CommandLineType)value);
- }
- break;
-
- case DATA_STAGED:
- if (value == null) {
- unsetDataStaged();
- } else {
- setDataStaged((Boolean)value);
- }
- break;
-
}
}
@@ -703,18 +511,6 @@ import org.slf4j.LoggerFactory;
case META_DATA:
return getMetaData();
- case INPUT_ORDER:
- return Integer.valueOf(getInputOrder());
-
- case INPUT_VALID:
- return getInputValid();
-
- case ADDED_TO_COMMAND_LINE:
- return getAddedToCommandLine();
-
- case DATA_STAGED:
- return Boolean.valueOf(isDataStaged());
-
}
throw new IllegalStateException();
}
@@ -740,14 +536,6 @@ import org.slf4j.LoggerFactory;
return isSetUserFriendlyDescription();
case META_DATA:
return isSetMetaData();
- case INPUT_ORDER:
- return isSetInputOrder();
- case INPUT_VALID:
- return isSetInputValid();
- case ADDED_TO_COMMAND_LINE:
- return isSetAddedToCommandLine();
- case DATA_STAGED:
- return isSetDataStaged();
}
throw new IllegalStateException();
}
@@ -828,42 +616,6 @@ import org.slf4j.LoggerFactory;
return false;
}
- boolean this_present_inputOrder = true && this.isSetInputOrder();
- boolean that_present_inputOrder = true && that.isSetInputOrder();
- if (this_present_inputOrder || that_present_inputOrder) {
- if (!(this_present_inputOrder && that_present_inputOrder))
- return false;
- if (this.inputOrder != that.inputOrder)
- return false;
- }
-
- boolean this_present_inputValid = true && this.isSetInputValid();
- boolean that_present_inputValid = true && that.isSetInputValid();
- if (this_present_inputValid || that_present_inputValid) {
- if (!(this_present_inputValid && that_present_inputValid))
- return false;
- if (!this.inputValid.equals(that.inputValid))
- return false;
- }
-
- boolean this_present_addedToCommandLine = true && this.isSetAddedToCommandLine();
- boolean that_present_addedToCommandLine = true && that.isSetAddedToCommandLine();
- if (this_present_addedToCommandLine || that_present_addedToCommandLine) {
- if (!(this_present_addedToCommandLine && that_present_addedToCommandLine))
- return false;
- if (!this.addedToCommandLine.equals(that.addedToCommandLine))
- return false;
- }
-
- boolean this_present_dataStaged = true && this.isSetDataStaged();
- boolean that_present_dataStaged = true && that.isSetDataStaged();
- if (this_present_dataStaged || that_present_dataStaged) {
- if (!(this_present_dataStaged && that_present_dataStaged))
- return false;
- if (this.dataStaged != that.dataStaged)
- return false;
- }
-
return true;
}
@@ -950,46 +702,6 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetInputOrder()).compareTo(other.isSetInputOrder());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetInputOrder()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputOrder, other.inputOrder);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetInputValid()).compareTo(other.isSetInputValid());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetInputValid()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inputValid, other.inputValid);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetAddedToCommandLine()).compareTo(other.isSetAddedToCommandLine());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAddedToCommandLine()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.addedToCommandLine, other.addedToCommandLine);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetDataStaged()).compareTo(other.isSetDataStaged());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetDataStaged()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataStaged, other.dataStaged);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -1073,38 +785,6 @@ import org.slf4j.LoggerFactory;
}
first = false;
}
- if (isSetInputOrder()) {
- if (!first) sb.append(", ");
- sb.append("inputOrder:");
- sb.append(this.inputOrder);
- first = false;
- }
- if (isSetInputValid()) {
- if (!first) sb.append(", ");
- sb.append("inputValid:");
- if (this.inputValid == null) {
- sb.append("null");
- } else {
- sb.append(this.inputValid);
- }
- first = false;
- }
- if (isSetAddedToCommandLine()) {
- if (!first) sb.append(", ");
- sb.append("addedToCommandLine:");
- if (this.addedToCommandLine == null) {
- sb.append("null");
- } else {
- sb.append(this.addedToCommandLine);
- }
- first = false;
- }
- if (isSetDataStaged()) {
- if (!first) sb.append(", ");
- sb.append("dataStaged:");
- sb.append(this.dataStaged);
- first = false;
- }
sb.append(")");
return sb.toString();
}
@@ -1210,38 +890,6 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // INPUT_ORDER
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.inputOrder = iprot.readI32();
- struct.setInputOrderIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 9: // INPUT_VALID
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.inputValid = ValidityType.findByValue(iprot.readI32());
- struct.setInputValidIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 10: // ADDED_TO_COMMAND_LINE
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.addedToCommandLine = CommandLineType.findByValue(iprot.readI32());
- struct.setAddedToCommandLineIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 11: // DATA_STAGED
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.dataStaged = iprot.readBool();
- struct.setDataStagedIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1300,30 +948,6 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldEnd();
}
}
- if (struct.isSetInputOrder()) {
- oprot.writeFieldBegin(INPUT_ORDER_FIELD_DESC);
- oprot.writeI32(struct.inputOrder);
- oprot.writeFieldEnd();
- }
- if (struct.inputValid != null) {
- if (struct.isSetInputValid()) {
- oprot.writeFieldBegin(INPUT_VALID_FIELD_DESC);
- oprot.writeI32(struct.inputValid.getValue());
- oprot.writeFieldEnd();
- }
- }
- if (struct.addedToCommandLine != null) {
- if (struct.isSetAddedToCommandLine()) {
- oprot.writeFieldBegin(ADDED_TO_COMMAND_LINE_FIELD_DESC);
- oprot.writeI32(struct.addedToCommandLine.getValue());
- oprot.writeFieldEnd();
- }
- }
- if (struct.isSetDataStaged()) {
- oprot.writeFieldBegin(DATA_STAGED_FIELD_DESC);
- oprot.writeBool(struct.dataStaged);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1361,19 +985,7 @@ import org.slf4j.LoggerFactory;
if (struct.isSetMetaData()) {
optionals.set(5);
}
- if (struct.isSetInputOrder()) {
- optionals.set(6);
- }
- if (struct.isSetInputValid()) {
- optionals.set(7);
- }
- if (struct.isSetAddedToCommandLine()) {
- optionals.set(8);
- }
- if (struct.isSetDataStaged()) {
- optionals.set(9);
- }
- oprot.writeBitSet(optionals, 10);
+ oprot.writeBitSet(optionals, 6);
if (struct.isSetValue()) {
oprot.writeString(struct.value);
}
@@ -1392,18 +1004,6 @@ import org.slf4j.LoggerFactory;
if (struct.isSetMetaData()) {
oprot.writeString(struct.metaData);
}
- if (struct.isSetInputOrder()) {
- oprot.writeI32(struct.inputOrder);
- }
- if (struct.isSetInputValid()) {
- oprot.writeI32(struct.inputValid.getValue());
- }
- if (struct.isSetAddedToCommandLine()) {
- oprot.writeI32(struct.addedToCommandLine.getValue());
- }
- if (struct.isSetDataStaged()) {
- oprot.writeBool(struct.dataStaged);
- }
}
@Override
@@ -1411,7 +1011,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.name = iprot.readString();
struct.setNameIsSet(true);
- BitSet incoming = iprot.readBitSet(10);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.value = iprot.readString();
struct.setValueIsSet(true);
@@ -1436,22 +1036,6 @@ import org.slf4j.LoggerFactory;
struct.metaData = iprot.readString();
struct.setMetaDataIsSet(true);
}
- if (incoming.get(6)) {
- struct.inputOrder = iprot.readI32();
- struct.setInputOrderIsSet(true);
- }
- if (incoming.get(7)) {
- struct.inputValid = ValidityType.findByValue(iprot.readI32());
- struct.setInputValidIsSet(true);
- }
- if (incoming.get(8)) {
- struct.addedToCommandLine = CommandLineType.findByValue(iprot.readI32());
- struct.setAddedToCommandLineIsSet(true);
- }
- if (incoming.get(9)) {
- struct.dataStaged = iprot.readBool();
- struct.setDataStagedIsSet(true);
- }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
index 337f167..ddfaae9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/OutputDataObjectType.java
@@ -81,9 +81,6 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)3);
- private static final org.apache.thrift.protocol.TField VALIDITY_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("validityType", org.apache.thrift.protocol.TType.I32, (short)4);
- private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovement", org.apache.thrift.protocol.TType.BOOL, (short)5);
- private static final org.apache.thrift.protocol.TField DATA_NAME_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("dataNameLocation", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -94,9 +91,6 @@ import org.slf4j.LoggerFactory;
private String name; // required
private String value; // optional
private DataType type; // optional
- private ValidityType validityType; // optional
- private boolean dataMovement; // optional
- private String dataNameLocation; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -106,14 +100,7 @@ import org.slf4j.LoggerFactory;
*
* @see DataType
*/
- TYPE((short)3, "type"),
- /**
- *
- * @see ValidityType
- */
- VALIDITY_TYPE((short)4, "validityType"),
- DATA_MOVEMENT((short)5, "dataMovement"),
- DATA_NAME_LOCATION((short)6, "dataNameLocation");
+ TYPE((short)3, "type");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -134,12 +121,6 @@ import org.slf4j.LoggerFactory;
return VALUE;
case 3: // TYPE
return TYPE;
- case 4: // VALIDITY_TYPE
- return VALIDITY_TYPE;
- case 5: // DATA_MOVEMENT
- return DATA_MOVEMENT;
- case 6: // DATA_NAME_LOCATION
- return DATA_NAME_LOCATION;
default:
return null;
}
@@ -180,9 +161,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final int __DATAMOVEMENT_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.VALIDITY_TYPE,_Fields.DATA_MOVEMENT,_Fields.DATA_NAME_LOCATION};
+ private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -192,12 +171,6 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DataType.class)));
- tmpMap.put(_Fields.VALIDITY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("validityType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ValidityType.class)));
- tmpMap.put(_Fields.DATA_MOVEMENT, new org.apache.thrift.meta_data.FieldMetaData("dataMovement", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.DATA_NAME_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("dataNameLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OutputDataObjectType.class, metaDataMap);
}
@@ -216,7 +189,6 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public OutputDataObjectType(OutputDataObjectType other) {
- __isset_bitfield = other.__isset_bitfield;
if (other.isSetName()) {
this.name = other.name;
}
@@ -226,13 +198,6 @@ import org.slf4j.LoggerFactory;
if (other.isSetType()) {
this.type = other.type;
}
- if (other.isSetValidityType()) {
- this.validityType = other.validityType;
- }
- this.dataMovement = other.dataMovement;
- if (other.isSetDataNameLocation()) {
- this.dataNameLocation = other.dataNameLocation;
- }
}
public OutputDataObjectType deepCopy() {
@@ -244,10 +209,6 @@ import org.slf4j.LoggerFactory;
this.name = null;
this.value = null;
this.type = null;
- this.validityType = null;
- setDataMovementIsSet(false);
- this.dataMovement = false;
- this.dataNameLocation = null;
}
public String getName() {
@@ -327,82 +288,6 @@ import org.slf4j.LoggerFactory;
}
}
- /**
- *
- * @see ValidityType
- */
- public ValidityType getValidityType() {
- return this.validityType;
- }
-
- /**
- *
- * @see ValidityType
- */
- public void setValidityType(ValidityType validityType) {
- this.validityType = validityType;
- }
-
- public void unsetValidityType() {
- this.validityType = null;
- }
-
- /** Returns true if field validityType is set (has been assigned a value) and false otherwise */
- public boolean isSetValidityType() {
- return this.validityType != null;
- }
-
- public void setValidityTypeIsSet(boolean value) {
- if (!value) {
- this.validityType = null;
- }
- }
-
- public boolean isDataMovement() {
- return this.dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- setDataMovementIsSet(true);
- }
-
- public void unsetDataMovement() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID);
- }
-
- /** Returns true if field dataMovement is set (has been assigned a value) and false otherwise */
- public boolean isSetDataMovement() {
- return EncodingUtils.testBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID);
- }
-
- public void setDataMovementIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DATAMOVEMENT_ISSET_ID, value);
- }
-
- public String getDataNameLocation() {
- return this.dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
-
- public void unsetDataNameLocation() {
- this.dataNameLocation = null;
- }
-
- /** Returns true if field dataNameLocation is set (has been assigned a value) and false otherwise */
- public boolean isSetDataNameLocation() {
- return this.dataNameLocation != null;
- }
-
- public void setDataNameLocationIsSet(boolean value) {
- if (!value) {
- this.dataNameLocation = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case NAME:
@@ -429,30 +314,6 @@ import org.slf4j.LoggerFactory;
}
break;
- case VALIDITY_TYPE:
- if (value == null) {
- unsetValidityType();
- } else {
- setValidityType((ValidityType)value);
- }
- break;
-
- case DATA_MOVEMENT:
- if (value == null) {
- unsetDataMovement();
- } else {
- setDataMovement((Boolean)value);
- }
- break;
-
- case DATA_NAME_LOCATION:
- if (value == null) {
- unsetDataNameLocation();
- } else {
- setDataNameLocation((String)value);
- }
- break;
-
}
}
@@ -467,15 +328,6 @@ import org.slf4j.LoggerFactory;
case TYPE:
return getType();
- case VALIDITY_TYPE:
- return getValidityType();
-
- case DATA_MOVEMENT:
- return Boolean.valueOf(isDataMovement());
-
- case DATA_NAME_LOCATION:
- return getDataNameLocation();
-
}
throw new IllegalStateException();
}
@@ -493,12 +345,6 @@ import org.slf4j.LoggerFactory;
return isSetValue();
case TYPE:
return isSetType();
- case VALIDITY_TYPE:
- return isSetValidityType();
- case DATA_MOVEMENT:
- return isSetDataMovement();
- case DATA_NAME_LOCATION:
- return isSetDataNameLocation();
}
throw new IllegalStateException();
}
@@ -543,33 +389,6 @@ import org.slf4j.LoggerFactory;
return false;
}
- boolean this_present_validityType = true && this.isSetValidityType();
- boolean that_present_validityType = true && that.isSetValidityType();
- if (this_present_validityType || that_present_validityType) {
- if (!(this_present_validityType && that_present_validityType))
- return false;
- if (!this.validityType.equals(that.validityType))
- return false;
- }
-
- boolean this_present_dataMovement = true && this.isSetDataMovement();
- boolean that_present_dataMovement = true && that.isSetDataMovement();
- if (this_present_dataMovement || that_present_dataMovement) {
- if (!(this_present_dataMovement && that_present_dataMovement))
- return false;
- if (this.dataMovement != that.dataMovement)
- return false;
- }
-
- boolean this_present_dataNameLocation = true && this.isSetDataNameLocation();
- boolean that_present_dataNameLocation = true && that.isSetDataNameLocation();
- if (this_present_dataNameLocation || that_present_dataNameLocation) {
- if (!(this_present_dataNameLocation && that_present_dataNameLocation))
- return false;
- if (!this.dataNameLocation.equals(that.dataNameLocation))
- return false;
- }
-
return true;
}
@@ -616,36 +435,6 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetValidityType()).compareTo(other.isSetValidityType());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetValidityType()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validityType, other.validityType);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetDataMovement()).compareTo(other.isSetDataMovement());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetDataMovement()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovement, other.dataMovement);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetDataNameLocation()).compareTo(other.isSetDataNameLocation());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetDataNameLocation()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataNameLocation, other.dataNameLocation);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -693,32 +482,6 @@ import org.slf4j.LoggerFactory;
}
first = false;
}
- if (isSetValidityType()) {
- if (!first) sb.append(", ");
- sb.append("validityType:");
- if (this.validityType == null) {
- sb.append("null");
- } else {
- sb.append(this.validityType);
- }
- first = false;
- }
- if (isSetDataMovement()) {
- if (!first) sb.append(", ");
- sb.append("dataMovement:");
- sb.append(this.dataMovement);
- first = false;
- }
- if (isSetDataNameLocation()) {
- if (!first) sb.append(", ");
- sb.append("dataNameLocation:");
- if (this.dataNameLocation == null) {
- sb.append("null");
- } else {
- sb.append(this.dataNameLocation);
- }
- first = false;
- }
sb.append(")");
return sb.toString();
}
@@ -742,8 +505,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -792,30 +553,6 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // VALIDITY_TYPE
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.validityType = ValidityType.findByValue(iprot.readI32());
- struct.setValidityTypeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 5: // DATA_MOVEMENT
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.dataMovement = iprot.readBool();
- struct.setDataMovementIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 6: // DATA_NAME_LOCATION
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.dataNameLocation = iprot.readString();
- struct.setDataNameLocationIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -848,25 +585,6 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldEnd();
}
}
- if (struct.validityType != null) {
- if (struct.isSetValidityType()) {
- oprot.writeFieldBegin(VALIDITY_TYPE_FIELD_DESC);
- oprot.writeI32(struct.validityType.getValue());
- oprot.writeFieldEnd();
- }
- }
- if (struct.isSetDataMovement()) {
- oprot.writeFieldBegin(DATA_MOVEMENT_FIELD_DESC);
- oprot.writeBool(struct.dataMovement);
- oprot.writeFieldEnd();
- }
- if (struct.dataNameLocation != null) {
- if (struct.isSetDataNameLocation()) {
- oprot.writeFieldBegin(DATA_NAME_LOCATION_FIELD_DESC);
- oprot.writeString(struct.dataNameLocation);
- oprot.writeFieldEnd();
- }
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -892,31 +610,13 @@ import org.slf4j.LoggerFactory;
if (struct.isSetType()) {
optionals.set(1);
}
- if (struct.isSetValidityType()) {
- optionals.set(2);
- }
- if (struct.isSetDataMovement()) {
- optionals.set(3);
- }
- if (struct.isSetDataNameLocation()) {
- optionals.set(4);
- }
- oprot.writeBitSet(optionals, 5);
+ oprot.writeBitSet(optionals, 2);
if (struct.isSetValue()) {
oprot.writeString(struct.value);
}
if (struct.isSetType()) {
oprot.writeI32(struct.type.getValue());
}
- if (struct.isSetValidityType()) {
- oprot.writeI32(struct.validityType.getValue());
- }
- if (struct.isSetDataMovement()) {
- oprot.writeBool(struct.dataMovement);
- }
- if (struct.isSetDataNameLocation()) {
- oprot.writeString(struct.dataNameLocation);
- }
}
@Override
@@ -924,7 +624,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.name = iprot.readString();
struct.setNameIsSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
struct.value = iprot.readString();
struct.setValueIsSet(true);
@@ -933,18 +633,6 @@ import org.slf4j.LoggerFactory;
struct.type = DataType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
}
- if (incoming.get(2)) {
- struct.validityType = ValidityType.findByValue(iprot.readI32());
- struct.setValidityTypeIsSet(true);
- }
- if (incoming.get(3)) {
- struct.dataMovement = iprot.readBool();
- struct.setDataMovementIsSet(true);
- }
- if (incoming.get(4)) {
- struct.dataNameLocation = iprot.readString();
- struct.setDataNameLocationIsSet(true);
- }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java
index ad7a0de..4030857 100644
--- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java
+++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/AppInterfaceUtil.java
@@ -45,7 +45,6 @@ public class AppInterfaceUtil {
String value,
DataType type,
String applicationArgument,
- int order,
boolean standardInput,
String userFriendlyDesc,
String metadata){
@@ -55,7 +54,6 @@ public class AppInterfaceUtil {
appInput.setType(type);
appInput.setMetaData(metadata);
appInput.setApplicationArgument(applicationArgument);
- appInput.setInputOrder(order);
appInput.setUserFriendlyDescription(userFriendlyDesc);
appInput.setStandardInput(standardInput);
return appInput;
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
index 8e6c896..2bb16dc 100644
--- a/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationInterfaceModel.thrift
@@ -43,22 +43,6 @@ enum DataType{
STDERR
}
-enum ValidityType{
- REQUIRED,
- OPTIONAL
-}
-
-enum CommandLineType{
- INCLUSIVE,
- EXCLUSIVE
-}
-
-enum InputMetadataType {
- MEMORY,
- CPU
-}
-
-
/**
* Application Inputs. The paramters describe how inputs are passed to the application.
*
@@ -86,17 +70,14 @@ enum InputMetadataType {
*
*/
struct InputDataObjectType {
+// 1: required bool isEmpty = 0,
1: required string name,
2: optional string value,
3: optional DataType type,
4: optional string applicationArgument,
5: optional bool standardInput = 0,
6: optional string userFriendlyDescription,
- 7: optional string metaData,
- 8: optional i32 inputOrder,
- 9: optional ValidityType inputValid,
- 10: optional CommandLineType addedToCommandLine,
- 11: optional bool dataStaged = 0
+ 7: optional string metaData
}
/**
@@ -126,12 +107,10 @@ struct InputDataObjectType {
*
*/
struct OutputDataObjectType {
+// 1: required bool isEmpty = 0,
1: required string name,
2: optional string value,
- 3: optional DataType type,
- 4: optional ValidityType validityType,
- 5: optional bool dataMovement,
- 6: optional string dataNameLocation
+ 3: optional DataType type
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
index 67bd1bc..d430ebe 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
@@ -101,9 +101,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
inputResource.setInputVal(input.getValue());
inputResource.setDataType(input.getType().toString());
inputResource.setMetadata(input.getMetaData());
- inputResource.setStandardInput(input.isStandardInput());
+ inputResource.setStandareInput(input.isStandardInput());
inputResource.setAppArgument(input.getApplicationArgument());
- inputResource.setInputOrder(input.getInputOrder());
inputResource.save();
}
}
@@ -217,9 +216,8 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
inputResource.setInputVal(input.getValue());
inputResource.setDataType(input.getType().toString());
inputResource.setMetadata(input.getMetaData());
- inputResource.setStandardInput(input.isStandardInput());
+ inputResource.setStandareInput(input.isStandardInput());
inputResource.setAppArgument(input.getApplicationArgument());
- inputResource.setInputOrder(input.getInputOrder());
inputResource.save();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/WorkflowCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/WorkflowCatalogImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/WorkflowCatalogImpl.java
index a57ac49..3474b40 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/WorkflowCatalogImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/WorkflowCatalogImpl.java
@@ -98,7 +98,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
wfInputResource.setWfTemplateId(resource.getWfTemplateId());
wfInputResource.setDataType(input.getType().toString());
wfInputResource.setAppArgument(input.getApplicationArgument());
- wfInputResource.setStandardInput(input.isStandardInput());
+ wfInputResource.setStandareInput(input.isStandardInput());
wfInputResource.setUserFriendlyDesc(input.getUserFriendlyDescription());
wfInputResource.setMetadata(input.getMetaData());
wfInputResource.save();
@@ -148,7 +148,7 @@ public class WorkflowCatalogImpl implements WorkflowCatalog {
existingInput.setWfTemplateId(existingWF.getWfTemplateId());
existingInput.setDataType(input.getType().toString());
existingInput.setAppArgument(input.getApplicationArgument());
- existingInput.setStandardInput(input.isStandardInput());
+ existingInput.setStandareInput(input.isStandardInput());
existingInput.setUserFriendlyDesc(input.getUserFriendlyDescription());
existingInput.setMetadata(input.getMetaData());
existingInput.save();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
index e7b98c2..689f24e 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInput.java
@@ -47,14 +47,6 @@ public class ApplicationInput implements Serializable {
private String userFriendlyDesc;
@Column(name = "STANDARD_INPUT")
private boolean standardInput;
- @Column(name="INPUT_ORDER")
- private int inputOrder;
- @Column(name="VALIDITY_TYPE")
- private String validityType;
- @Column(name="COMMANDLINE_TYPE")
- private String commandLineType;
- @Column(name = "DATA_STAGED")
- private boolean dataStaged;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "INTERFACE_ID")
@@ -131,36 +123,4 @@ public class ApplicationInput implements Serializable {
public void setStandardInput(boolean standardInput) {
this.standardInput = standardInput;
}
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
index c13e7d3..6e418af 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationOutput.java
@@ -39,12 +39,6 @@ public class ApplicationOutput implements Serializable {
private String outputVal;
@Column(name = "DATA_TYPE")
private String dataType;
- @Column(name = "VALIDITY_TYPE")
- private String validityType;
- @Column(name = "DATA_MOVEMENT")
- private boolean dataMovement;
- @Column(name = "DATA_NAME_LOCATION")
- private String dataNameLocation;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "INTERFACE_ID")
@@ -89,28 +83,4 @@ public class ApplicationOutput implements Serializable {
public void setOutputVal(String outputVal) {
this.outputVal = outputVal;
}
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
index 8318bee..81d2b6d 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowInput.java
@@ -48,16 +48,8 @@ public class WorkflowInput implements Serializable {
private String userFriendlyDesc;
@Column(name = "STANDARD_INPUT")
private boolean standardInput;
- @Column(name = "INPUT_ORDER")
- private int inputOrder;
- @Column(name="VALIDITY_TYPE")
- private String validityType;
- @Column(name="COMMANDLINE_TYPE")
- private String commandLineType;
- @Column(name = "DATA_STAGED")
- private boolean dataStaged;
-
- @ManyToOne(cascade = CascadeType.MERGE)
+
+ @ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "WF_TEMPLATE_ID")
private Workflow workflow;
@@ -132,36 +124,4 @@ public class WorkflowInput implements Serializable {
public void setStandardInput(boolean standardInput) {
this.standardInput = standardInput;
}
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
index 8343a48..5532c6c 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/WorkflowOutput.java
@@ -40,12 +40,6 @@ public class WorkflowOutput implements Serializable {
private char[] outputVal;
@Column(name = "DATA_TYPE")
private String dataType;
- @Column(name = "VALIDITY_TYPE")
- private String validityType;
- @Column(name = "DATA_MOVEMENT")
- private boolean dataMovement;
- @Column(name = "DATA_NAME_LOCATION")
- private String dataNameLocation;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "WF_TEMPLATE_ID")
@@ -90,28 +84,4 @@ public class WorkflowOutput implements Serializable {
public void setOutputVal(char[] outputVal) {
this.outputVal = outputVal;
}
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
index 87e1246..6894ff1 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationInputResource.java
@@ -48,11 +48,7 @@ public class ApplicationInputResource extends AbstractResource {
private String metadata;
private String appArgument;
private String userFriendlyDesc;
- private int inputOrder;
- private boolean standardInput;
- private String validityType;
- private String commandLineType;
- private boolean dataStaged;
+ private boolean standareInput;
private AppInterfaceResource appInterfaceResource;
@@ -292,11 +288,7 @@ public class ApplicationInputResource extends AbstractResource {
applicationInput.setMetadata(metadata);
applicationInput.setAppArgument(appArgument);
applicationInput.setUserFriendlyDesc(userFriendlyDesc);
- applicationInput.setStandardInput(standardInput);
- applicationInput.setInputOrder(inputOrder);
- applicationInput.setCommandLineType(commandLineType);
- applicationInput.setValidityType(validityType);
- applicationInput.setDataStaged(dataStaged);
+ applicationInput.setStandardInput(standareInput);
if (existingApplicationInput == null) {
em.persist(applicationInput);
} else {
@@ -412,43 +404,11 @@ public class ApplicationInputResource extends AbstractResource {
this.appInterfaceResource = appInterfaceResource;
}
- public boolean isStandardInput() {
- return standardInput;
+ public boolean isStandareInput() {
+ return standareInput;
}
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
+ public void setStandareInput(boolean standareInput) {
+ this.standareInput = standareInput;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
index e3d97c2..ea0f52b 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ApplicationOutputResource.java
@@ -44,9 +44,6 @@ public class ApplicationOutputResource extends AbstractResource {
private String outputKey;
private String outputVal;
private String dataType;
- private String validityType;
- private boolean dataMovement;
- private String dataNameLocation;
private AppInterfaceResource appInterfaceResource;
@@ -286,9 +283,6 @@ public class ApplicationOutputResource extends AbstractResource {
applicationOutput.setDataType(dataType);
applicationOutput.setOutputKey(outputKey);
applicationOutput.setOutputVal(outputVal);
- applicationOutput.setValidityType(validityType);
- applicationOutput.setDataMovement(dataMovement);
- applicationOutput.setDataNameLocation(dataNameLocation);
em.merge(applicationOutput);
em.getTransaction().commit();
em.close();
@@ -375,28 +369,4 @@ public class ApplicationOutputResource extends AbstractResource {
public void setAppInterfaceResource(AppInterfaceResource appInterfaceResource) {
this.appInterfaceResource = appInterfaceResource;
}
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
index c00d48c..75c1351 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowInputResource.java
@@ -48,11 +48,7 @@ public class WorkflowInputResource extends AbstractResource {
private String metadata;
private String appArgument;
private String userFriendlyDesc;
- private boolean standardInput;
- private int inputOrder;
- private String validityType;
- private String commandLineType;
- private boolean dataStaged;
+ private boolean standareInput;
private WorkflowResource workflowResource;
@@ -290,10 +286,7 @@ public class WorkflowInputResource extends AbstractResource {
workflowInput.setMetadata(metadata);
workflowInput.setAppArgument(appArgument);
workflowInput.setUserFriendlyDesc(userFriendlyDesc);
- workflowInput.setStandardInput(standardInput);
- workflowInput.setCommandLineType(commandLineType);
- workflowInput.setValidityType(validityType);
- workflowInput.setDataStaged(dataStaged);
+ workflowInput.setStandardInput(standareInput);
if (existingWFInput == null) {
em.persist(workflowInput);
} else {
@@ -409,43 +402,11 @@ public class WorkflowInputResource extends AbstractResource {
this.workflowResource = workflowResource;
}
- public boolean isStandardInput() {
- return standardInput;
+ public boolean isStandareInput() {
+ return standareInput;
}
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
+ public void setStandareInput(boolean standareInput) {
+ this.standareInput = standareInput;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowOutputResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowOutputResource.java
index b8f7bbf..edefad9 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowOutputResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowOutputResource.java
@@ -44,9 +44,6 @@ public class WorkflowOutputResource extends AbstractResource {
private String outputKey;
private String outputVal;
private String dataType;
- private String validityType;
- private boolean dataMovement;
- private String dataNameLocation;
private WorkflowResource workflowResource;
@@ -279,9 +276,6 @@ public class WorkflowOutputResource extends AbstractResource {
if (outputKey != null){
existingWorkflowOutput.setOutputVal(outputVal.toCharArray());
}
- existingWorkflowOutput.setValidityType(validityType);
- existingWorkflowOutput.setDataMovement(dataMovement);
- existingWorkflowOutput.setDataNameLocation(dataNameLocation);
em.merge(existingWorkflowOutput);
} else {
WorkflowOutput workflowOutput = new WorkflowOutput();
@@ -293,9 +287,6 @@ public class WorkflowOutputResource extends AbstractResource {
if (outputKey != null){
workflowOutput.setOutputVal(outputVal.toCharArray());
}
- workflowOutput.setValidityType(validityType);
- workflowOutput.setDataMovement(dataMovement);
- workflowOutput.setDataNameLocation(dataNameLocation);
em.persist(workflowOutput);
}
em.getTransaction().commit();
@@ -383,28 +374,4 @@ public class WorkflowOutputResource extends AbstractResource {
public void setWorkflowResource(WorkflowResource workflowResource) {
this.workflowResource = workflowResource;
}
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
index 4c9d257..aca396a 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
@@ -760,11 +760,7 @@ public class AppCatalogJPAUtils {
resource.setMetadata(o.getMetadata());
resource.setAppArgument(o.getAppArgument());
resource.setUserFriendlyDesc(o.getUserFriendlyDesc());
- resource.setStandardInput(o.isStandardInput());
- resource.setInputOrder(o.getInputOrder());
- resource.setValidityType(o.getValidityType());
- resource.setCommandLineType(o.getCommandLineType());
- resource.setDataStaged(o.isDataStaged());
+ resource.setStandareInput(o.isStandardInput());
resource.setAppInterfaceResource((AppInterfaceResource)createAppInterfaceResource(o.getApplicationInterface()));
}
return resource;
@@ -781,12 +777,8 @@ public class AppCatalogJPAUtils {
resource.setDataType(o.getDataType());
resource.setMetadata(o.getMetadata());
resource.setAppArgument(o.getAppArgument());
- resource.setInputOrder(o.getInputOrder());
resource.setUserFriendlyDesc(o.getUserFriendlyDesc());
- resource.setStandardInput(o.isStandardInput());
- resource.setValidityType(o.getValidityType());
- resource.setCommandLineType(o.getCommandLineType());
- resource.setDataStaged(o.isDataStaged());
+ resource.setStandareInput(o.isStandardInput());
resource.setWorkflowResource((WorkflowResource)createWorkflow(o.getWorkflow()));
}
return resource;
@@ -799,9 +791,6 @@ public class AppCatalogJPAUtils {
resource.setOutputKey(o.getOutputKey());
resource.setOutputVal(o.getOutputVal());
resource.setDataType(o.getDataType());
- resource.setValidityType(o.getValidityType());
- resource.setDataMovement(o.isDataMovement());
- resource.setDataNameLocation(o.getDataNameLocation());
resource.setAppInterfaceResource((AppInterfaceResource)createAppInterfaceResource(o.getApplicationInterface()));
}
return resource;
@@ -816,9 +805,6 @@ public class AppCatalogJPAUtils {
resource.setOutputVal(new String(o.getOutputVal()));
}
resource.setDataType(o.getDataType());
- resource.setValidityType(o.getValidityType());
- resource.setDataMovement(o.isDataMovement());
- resource.setDataNameLocation(o.getDataNameLocation());
resource.setWorkflowResource((WorkflowResource)createWorkflow(o.getWorkflow()));
}
return resource;
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index de9d577..9646bda 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -28,7 +28,10 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentD
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
-import org.apache.airavata.model.appcatalog.appinterface.*;
+import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
+import org.apache.airavata.model.appcatalog.appinterface.DataType;
+import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
+import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
@@ -553,18 +556,10 @@ public class AppCatalogThriftConversion {
inputDataObjectType.setName(input.getInputKey());
inputDataObjectType.setValue(input.getInputVal());
inputDataObjectType.setApplicationArgument(input.getAppArgument());
- inputDataObjectType.setInputOrder(input.getInputOrder());
inputDataObjectType.setMetaData(input.getMetadata());
inputDataObjectType.setType(DataType.valueOf(input.getDataType()));
- inputDataObjectType.setStandardInput(input.isStandardInput());
+ inputDataObjectType.setStandardInput(input.isStandareInput());
inputDataObjectType.setUserFriendlyDescription(input.getUserFriendlyDesc());
- if (input.getValidityType() != null){
- inputDataObjectType.setInputValid(ValidityType.valueOf(input.getValidityType()));
- }
- if (input.getCommandLineType() != null){
- inputDataObjectType.setAddedToCommandLine(CommandLineType.valueOf(input.getCommandLineType()));
- }
- inputDataObjectType.setDataStaged(input.isDataStaged());
return inputDataObjectType;
}
@@ -580,11 +575,6 @@ public class AppCatalogThriftConversion {
outputDataObjectType.setName(output.getOutputKey());
outputDataObjectType.setValue(output.getOutputVal());
outputDataObjectType.setType(DataType.valueOf(output.getDataType()));
- if (output.getValidityType() != null){
- outputDataObjectType.setValidityType(ValidityType.valueOf(output.getValidityType()));
- }
- outputDataObjectType.setDataMovement(output.isDataMovement());
- outputDataObjectType.setDataNameLocation(output.getDataNameLocation());
return outputDataObjectType;
}
@@ -706,17 +696,9 @@ public class AppCatalogThriftConversion {
InputDataObjectType input = new InputDataObjectType();
input.setName(resource.getInputKey());
input.setApplicationArgument(resource.getAppArgument());
- input.setInputOrder(resource.getInputOrder());
input.setType(DataType.valueOf(resource.getDataType()));
input.setMetaData(resource.getMetadata());
input.setUserFriendlyDescription(resource.getUserFriendlyDesc());
- if (resource.getValidityType() != null){
- input.setInputValid(ValidityType.valueOf(resource.getValidityType()));
- }
- if (resource.getCommandLineType() != null){
- input.setAddedToCommandLine(CommandLineType.valueOf(resource.getCommandLineType()));
- }
- input.setDataStaged(resource.isDataStaged());
return input;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
index a98fef6..7037508 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
@@ -270,10 +270,6 @@ CREATE TABLE APPLICATION_INPUT
METADATA VARCHAR(255),
APP_ARGUMENT VARCHAR(255),
STANDARD_INPUT SMALLINT,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
USER_FRIENDLY_DESC VARCHAR(255),
PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
@@ -285,9 +281,6 @@ CREATE TABLE APPLICATION_OUTPUT
OUTPUT_KEY VARCHAR(255),
OUTPUT_VALUE VARCHAR(255),
DATA_TYPE VARCHAR(255),
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
index 5a4d239..44d7fd8 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
@@ -256,10 +256,6 @@ CREATE TABLE APPLICATION_INPUT
APP_ARGUMENT VARCHAR(255),
STANDARD_INPUT SMALLINT,
USER_FRIENDLY_DESC VARCHAR(255),
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
);
@@ -270,9 +266,6 @@ CREATE TABLE APPLICATION_OUTPUT
OUTPUT_KEY VARCHAR(255),
OUTPUT_VALUE VARCHAR(255),
DATA_TYPE VARCHAR(255),
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
index d2e5d0c..1a1dbd3 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
@@ -47,7 +47,6 @@ import static org.junit.Assert.assertTrue;
public class AppInterfaceTest {
private static Initialize initialize;
private static AppCatalog appcatalog;
- private static int order = 1;
@Before
public void setUp() {
@@ -170,7 +169,6 @@ public class AppInterfaceTest {
input.setValue(value);
input.setType(type);
input.setApplicationArgument("test arg");
- input.setInputOrder(order++);
return input;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
index a98fef6..7037508 100644
--- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
@@ -270,10 +270,6 @@ CREATE TABLE APPLICATION_INPUT
METADATA VARCHAR(255),
APP_ARGUMENT VARCHAR(255),
STANDARD_INPUT SMALLINT,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
USER_FRIENDLY_DESC VARCHAR(255),
PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
@@ -285,9 +281,6 @@ CREATE TABLE APPLICATION_OUTPUT
OUTPUT_KEY VARCHAR(255),
OUTPUT_VALUE VARCHAR(255),
DATA_TYPE VARCHAR(255),
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
index 9f055e9..f6ecc5f 100644
--- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
+++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
@@ -23,12 +23,8 @@ package org.apache.airavata.gfac.local.provider.impl;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
import org.apache.airavata.gfac.Constants;
import org.apache.airavata.gfac.GFacException;
@@ -43,7 +39,6 @@ import org.apache.airavata.gfac.local.utils.InputStreamToFileWriter;
import org.apache.airavata.gfac.local.utils.InputUtils;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
-import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
import org.apache.airavata.model.messaging.event.JobIdentifier;
import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
@@ -110,8 +105,7 @@ public class LocalProvider extends AbstractProvider {
public void initialize(JobExecutionContext jobExecutionContext) throws GFacProviderException,GFacException {
super.initialize(jobExecutionContext);
- // build command with all inputs
- buildCommand();
+ buildCommand(jobExecutionContext.getExecutablePath(), ProviderUtils.getInputParameterValues(jobExecutionContext));
initProcessBuilder(jobExecutionContext.getApplicationContext().getApplicationDeploymentDescription());
// extra environment variables
@@ -253,36 +247,9 @@ public class LocalProvider extends AbstractProvider {
}
- private void buildCommand() {
- cmdList.add(jobExecutionContext.getExecutablePath());
- Map<String, Object> inputParameters = jobExecutionContext.getInMessageContext().getParameters();
-
- // sort the inputs first and then build the command List
- Comparator<InputDataObjectType> inputOrderComparator = new Comparator<InputDataObjectType>() {
- @Override
- public int compare(InputDataObjectType inputDataObjectType, InputDataObjectType t1) {
- return inputDataObjectType.getInputOrder() - t1.getInputOrder();
- }
- };
- Set<InputDataObjectType> sortedInputSet = new TreeSet<InputDataObjectType>(inputOrderComparator);
- for (Object object : inputParameters.values()) {
- if (object instanceof InputDataObjectType) {
- InputDataObjectType inputDOT = (InputDataObjectType) object;
- sortedInputSet.add(inputDOT);
- }
- }
- for (InputDataObjectType inputDataObjectType : sortedInputSet) {
- if (inputDataObjectType.getApplicationArgument() != null
- && !inputDataObjectType.getApplicationArgument().equals("")) {
- cmdList.add(inputDataObjectType.getApplicationArgument());
- }
-
- if (inputDataObjectType.getValue() != null
- && !inputDataObjectType.getValue().equals("")) {
- cmdList.add(inputDataObjectType.getValue());
- }
- }
-
+ private void buildCommand(String executable, List<String> inputParameterList){
+ cmdList.add(executable);
+ cmdList.addAll(inputParameterList);
}
private void initProcessBuilder(ApplicationDeploymentDescription app){
Re: [2/4] airavata git commit: Revert "Merge branch 'master' of"
Posted by Shameera Rathnayaka <sh...@gmail.com>.
Hi Chathuri,
This commit has reverted input order preserve changes too. I am working on
get that commits back.
Thanks,
Shameera.
On Thu, Dec 11, 2014 at 1:03 AM, <ch...@apache.org> wrote:
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
> index 5768a0d..edbf39e 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
> @@ -271,11 +271,9 @@ public class ExperimentRegistry {
> resource.setExperimentKey(input.getName());
> resource.setValue(input.getValue());
> if (input.getType() != null){
> - resource.setDataType(input.getType().toString());
> + resource.setInputType(input.getType().toString());
> }
> resource.setMetadata(input.getMetaData());
> - resource.setAppArgument(input.getApplicationArgument());
> - resource.setInputOrder(input.getInputOrder());
> resource.save();
> }
> } catch (Exception e) {
> @@ -292,11 +290,9 @@ public class ExperimentRegistry {
> if
> (exinput.getExperimentKey().equals(input.getName())) {
> exinput.setValue(input.getValue());
> if (input.getType() != null){
> -
> exinput.setDataType(input.getType().toString());
> +
> exinput.setInputType(input.getType().toString());
> }
> exinput.setMetadata(input.getMetaData());
> -
> exinput.setAppArgument(input.getApplicationArgument());
> - exinput.setInputOrder(input.getInputOrder());
> exinput.save();
> }
> }
> @@ -317,7 +313,7 @@ public class ExperimentRegistry {
> resource.setExperimentKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> - resource.setDataType(output.getType().toString());
> + resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.get());
> resource.save();
> @@ -340,7 +336,7 @@ public class ExperimentRegistry {
> resource.setExperimentKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> -
> resource.setDataType(output.getType().toString());
> +
> resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.getMetaData());
> resource.save();
> @@ -363,7 +359,7 @@ public class ExperimentRegistry {
> resource.setOutputKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> - resource.setDataType(output.getType().toString());
> + resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.getMetaData());
> resource.save();
> @@ -386,7 +382,7 @@ public class ExperimentRegistry {
> resource.setOutputKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> - resource.setDataType(output.getType().toString());
> +
> resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.getMetaData());
> resource.save();
> @@ -409,7 +405,7 @@ public class ExperimentRegistry {
> resource.setOutputKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> - resource.setDataType(output.getType().toString());
> + resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.getMetaData());
> resource.save();
> @@ -817,11 +813,9 @@ public class ExperimentRegistry {
> resource.setInputKey(input.getName());
> resource.setValue(input.getValue());
> if (input.getType() != null){
> - resource.setDataType(input.getType().toString());
> + resource.setInputType(input.getType().toString());
> }
> resource.setMetadata(input.getMetaData());
> - resource.setAppArgument(input.getApplicationArgument());
> - resource.setInputOrder(input.getInputOrder());
> resource.save();
> }
> } catch (Exception e) {
> @@ -840,11 +834,9 @@ public class ExperimentRegistry {
> resource.setInputKey(input.getName());
> resource.setValue(input.getValue());
> if (input.getType() != null){
> - resource.setDataType(input.getType().toString());
> + resource.setInputType(input.getType().toString());
> }
> resource.setMetadata(input.getMetaData());
> -
> resource.setAppArgument(input.getApplicationArgument());
> - resource.setInputOrder(input.getInputOrder());
> resource.save();
> }
> }
> @@ -999,11 +991,9 @@ public class ExperimentRegistry {
> resource.setInputKey(input.getName());
> resource.setValue(input.getValue());
> if (input.getType() != null){
> - resource.setDataType(input.getType().toString());
> + resource.setInputType(input.getType().toString());
> }
> resource.setMetadata(input.getMetaData());
> - resource.setAppArgument(input.getApplicationArgument());
> - resource.setInputOrder(input.getInputOrder());
> resource.save();
> }
> } catch (Exception e) {
> @@ -1021,7 +1011,7 @@ public class ExperimentRegistry {
> resource.setOutputKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> - resource.setDataType(output.getType().toString());
> + resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.getMetaData());
> resource.save();
> @@ -1045,7 +1035,7 @@ public class ExperimentRegistry {
> resource.setOutputKey(output.getName());
> resource.setValue(output.getValue());
> if (output.getType() != null){
> - resource.setDataType(output.getType().toString());
> +
> resource.setOutputType(output.getType().toString());
> }
> // resource.setMetadata(output.getMetaData());
> resource.save();
> @@ -1066,11 +1056,9 @@ public class ExperimentRegistry {
> resource.setInputKey(input.getName());
> resource.setValue(input.getValue());
> if (input.getType() != null){
> - resource.setDataType(input.getType().toString());
> + resource.setInputType(input.getType().toString());
> }
> resource.setMetadata(input.getMetaData());
> -
> resource.setAppArgument(input.getApplicationArgument());
> - resource.setInputOrder(input.getInputOrder());
> resource.save();
> }
>
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
> index 2e68768..2e4d2b2 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
> @@ -37,44 +37,18 @@ public class ApplicationInput implements Serializable {
> @Id
> @Column(name = "INPUT_KEY")
> private String inputKey;
> - @Column(name = "DATA_TYPE")
> - private String dataType;
> + @Column(name = "INPUT_KEY_TYPE")
> + private String inputKeyType;
> @Column(name = "METADATA")
> private String metadata;
> @Lob
> @Column(name = "VALUE")
> private char[] value;
> - @Column(name = "APP_ARGUMENT")
> - private String appArgument;
> -
> - @Column(name = "INPUT_ORDER")
> - private int inputOrder;
> -
> - @Column(name = "STANDARD_INPUT")
> - private boolean standardInput;
> -
> - @Column(name = "USER_FRIENDLY_DESC")
> - private String userFriendlyDesc;
> -
> - @Column(name="VALIDITY_TYPE")
> - private String validityType;
> - @Column(name="COMMANDLINE_TYPE")
> - private String commandLineType;
> - @Column(name = "DATA_STAGED")
> - private boolean dataStaged;
>
> @ManyToOne(cascade= CascadeType.MERGE)
> @JoinColumn(name = "TASK_ID")
> private TaskDetail task;
>
> - public int getInputOrder() {
> - return inputOrder;
> - }
> -
> - public void setInputOrder(int inputOrder) {
> - this.inputOrder = inputOrder;
> - }
> -
> public String getTaskId() {
> return taskId;
> }
> @@ -91,12 +65,12 @@ public class ApplicationInput implements Serializable {
> this.inputKey = inputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getInputKeyType() {
> + return inputKeyType;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setInputKeyType(String inputKeyType) {
> + this.inputKeyType = inputKeyType;
> }
>
> public String getMetadata() {
> @@ -122,52 +96,4 @@ public class ApplicationInput implements Serializable {
> public void setTask(TaskDetail task) {
> this.task = task;
> }
> -
> - public String getAppArgument() {
> - return appArgument;
> - }
> -
> - public void setAppArgument(String appArgument) {
> - this.appArgument = appArgument;
> - }
> -
> - public boolean isStandardInput() {
> - return standardInput;
> - }
> -
> - public void setStandardInput(boolean standardInput) {
> - this.standardInput = standardInput;
> - }
> -
> - public String getUserFriendlyDesc() {
> - return userFriendlyDesc;
> - }
> -
> - public void setUserFriendlyDesc(String userFriendlyDesc) {
> - this.userFriendlyDesc = userFriendlyDesc;
> - }
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public String getCommandLineType() {
> - return commandLineType;
> - }
> -
> - public void setCommandLineType(String commandLineType) {
> - this.commandLineType = commandLineType;
> - }
> -
> - public boolean isDataStaged() {
> - return dataStaged;
> - }
> -
> - public void setDataStaged(boolean dataStaged) {
> - this.dataStaged = dataStaged;
> - }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
> index b13c842..e6f9efa 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
> @@ -37,19 +37,14 @@ public class ApplicationOutput implements Serializable
> {
> @Id
> @Column(name = "OUTPUT_KEY")
> private String outputKey;
> - @Column(name = "DATA_TYPE")
> - private String dataType;
> + @Column(name = "OUTPUT_KEY_TYPE")
> + private String outputKeyType;
> + @Column(name = "METADATA")
> + private String metadata;
> @Lob
> @Column(name = "VALUE")
> private char[] value;
>
> - @Column(name = "VALIDITY_TYPE")
> - private String validityType;
> - @Column(name = "DATA_MOVEMENT")
> - private boolean dataMovement;
> - @Column(name = "DATA_NAME_LOCATION")
> - private String dataNameLocation;
> -
> @ManyToOne(cascade= CascadeType.MERGE)
> @JoinColumn(name = "TASK_ID")
> private TaskDetail task;
> @@ -62,6 +57,14 @@ public class ApplicationOutput implements Serializable {
> this.taskId = taskId;
> }
>
> + public String getMetadata() {
> + return metadata;
> + }
> +
> + public void setMetadata(String metadata) {
> + this.metadata = metadata;
> + }
> +
> public char[] getValue() {
> return value;
> }
> @@ -86,35 +89,11 @@ public class ApplicationOutput implements Serializable
> {
> this.outputKey = outputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> - }
> -
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> - }
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public boolean isDataMovement() {
> - return dataMovement;
> - }
> -
> - public void setDataMovement(boolean dataMovement) {
> - this.dataMovement = dataMovement;
> - }
> -
> - public String getDataNameLocation() {
> - return dataNameLocation;
> + public String getOutputKeyType() {
> + return outputKeyType;
> }
>
> - public void setDataNameLocation(String dataNameLocation) {
> - this.dataNameLocation = dataNameLocation;
> + public void setOutputKeyType(String outputKeyType) {
> + this.outputKeyType = outputKeyType;
> }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
> index c174bce..5d7bbe6 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
> @@ -43,43 +43,16 @@ public class Experiment_Input implements Serializable {
> @Column(name = "VALUE")
> private char[] value;
>
> - @Column(name = "DATA_TYPE")
> - private String dataType;
> -
> - @Column(name = "APP_ARGUMENT")
> - private String appArgument;
> -
> - @Column(name = "STANDARD_INPUT")
> - private boolean standardInput;
> -
> - @Column(name = "USER_FRIENDLY_DESC")
> - private String userFriendlyDesc;
> + @Column(name = "INPUT_TYPE")
> + private String inputType;
>
> @Column(name = "METADATA")
> private String metadata;
>
> - @Column(name = "INPUT_ORDER")
> - private int inputOrder;
> -
> - @Column(name="VALIDITY_TYPE")
> - private String validityType;
> - @Column(name="COMMANDLINE_TYPE")
> - private String commandLineType;
> - @Column(name = "DATA_STAGED")
> - private boolean dataStaged;
> -
> @ManyToOne
> @JoinColumn(name = "EXPERIMENT_ID")
> private Experiment experiment;
>
> - public int getInputOrder() {
> - return inputOrder;
> - }
> -
> - public void setInputOrder(int inputOrder) {
> - this.inputOrder = inputOrder;
> - }
> -
> public String getExperiment_id() {
> return experiment_id;
> }
> @@ -104,12 +77,12 @@ public class Experiment_Input implements Serializable
> {
> this.value = value;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getInputType() {
> + return inputType;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setInputType(String inputType) {
> + this.inputType = inputType;
> }
>
> public String getMetadata() {
> @@ -127,52 +100,4 @@ public class Experiment_Input implements Serializable
> {
> public void setExperiment(Experiment experiment) {
> this.experiment = experiment;
> }
> -
> - public String getAppArgument() {
> - return appArgument;
> - }
> -
> - public void setAppArgument(String appArgument) {
> - this.appArgument = appArgument;
> - }
> -
> - public boolean isStandardInput() {
> - return standardInput;
> - }
> -
> - public void setStandardInput(boolean standardInput) {
> - this.standardInput = standardInput;
> - }
> -
> - public String getUserFriendlyDesc() {
> - return userFriendlyDesc;
> - }
> -
> - public void setUserFriendlyDesc(String userFriendlyDesc) {
> - this.userFriendlyDesc = userFriendlyDesc;
> - }
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public String getCommandLineType() {
> - return commandLineType;
> - }
> -
> - public void setCommandLineType(String commandLineType) {
> - this.commandLineType = commandLineType;
> - }
> -
> - public boolean isDataStaged() {
> - return dataStaged;
> - }
> -
> - public void setDataStaged(boolean dataStaged) {
> - this.dataStaged = dataStaged;
> - }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
> index c40a5ff..fd77403 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
> @@ -41,15 +41,10 @@ public class Experiment_Output implements
> Serializable {
> @Lob
> @Column(name = "VALUE")
> private char[] value;
> - @Column(name = "DATA_TYPE")
> - private String dataType;
> -
> - @Column(name = "VALIDITY_TYPE")
> - private String validityType;
> - @Column(name = "DATA_MOVEMENT")
> - private boolean dataMovement;
> - @Column(name = "DATA_NAME_LOCATION")
> - private String dataNameLocation;
> + @Column(name = "METADATA")
> + private String metadata;
> + @Column(name = "OUTPUT_KEY_TYPE")
> + private String outputKeyType;
>
> @ManyToOne
> @JoinColumn(name = "EXPERIMENT_ID")
> @@ -79,43 +74,27 @@ public class Experiment_Output implements
> Serializable {
> this.value = value;
> }
>
> - public String getDataType() {
> - return dataType;
> - }
> -
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public String getMetadata() {
> + return metadata;
> }
>
> - public Experiment getExperiment() {
> - return experiment;
> - }
> -
> - public void setExperiment(Experiment experiment) {
> - this.experiment = experiment;
> + public void setMetadata(String metadata) {
> + this.metadata = metadata;
> }
>
> - public String getValidityType() {
> - return validityType;
> + public String getOutputKeyType() {
> + return outputKeyType;
> }
>
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> + public void setOutputKeyType(String outputKeyType) {
> + this.outputKeyType = outputKeyType;
> }
>
> - public boolean isDataMovement() {
> - return dataMovement;
> - }
> -
> - public void setDataMovement(boolean dataMovement) {
> - this.dataMovement = dataMovement;
> - }
> -
> - public String getDataNameLocation() {
> - return dataNameLocation;
> + public Experiment getExperiment() {
> + return experiment;
> }
>
> - public void setDataNameLocation(String dataNameLocation) {
> - this.dataNameLocation = dataNameLocation;
> + public void setExperiment(Experiment experiment) {
> + this.experiment = experiment;
> }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
> index 6d090e8..9bfb917 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
> @@ -37,29 +37,12 @@ public class NodeInput implements Serializable {
> @Id
> @Column(name = "INPUT_KEY")
> private String inputKey;
> - @Column(name = "DATA_TYPE")
> - private String dataType;
> + @Column(name = "INPUT_KEY_TYPE")
> + private String inputKeyType;
> @Column(name = "METADATA")
> private String metadata;
> @Column(name = "VALUE")
> private String value;
> - @Column(name = "APP_ARGUMENT")
> - private String appArgument;
> - @Column(name = "INPUT_ORDER")
> - private int inputOrder;
> -
> - @Column(name = "STANDARD_INPUT")
> - private boolean standardInput;
> -
> - @Column(name = "USER_FRIENDLY_DESC")
> - private String userFriendlyDesc;
> -
> - @Column(name="VALIDITY_TYPE")
> - private String validityType;
> - @Column(name="COMMANDLINE_TYPE")
> - private String commandLineType;
> - @Column(name = "DATA_STAGED")
> - private boolean dataStaged;
>
> @ManyToOne(cascade= CascadeType.MERGE)
> @JoinColumn(name = "NODE_INSTANCE_ID")
> @@ -73,12 +56,12 @@ public class NodeInput implements Serializable {
> this.inputKey = inputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getInputKeyType() {
> + return inputKeyType;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setInputKeyType(String inputKeyType) {
> + this.inputKeyType = inputKeyType;
> }
>
> public String getMetadata() {
> @@ -112,60 +95,4 @@ public class NodeInput implements Serializable {
> public void setNodeDetails(WorkflowNodeDetail nodeDetails) {
> this.nodeDetails = nodeDetails;
> }
> -
> - public String getAppArgument() {
> - return appArgument;
> - }
> -
> - public void setAppArgument(String appArgument) {
> - this.appArgument = appArgument;
> - }
> -
> - public boolean isStandardInput() {
> - return standardInput;
> - }
> -
> - public void setStandardInput(boolean standardInput) {
> - this.standardInput = standardInput;
> - }
> -
> - public String getUserFriendlyDesc() {
> - return userFriendlyDesc;
> - }
> -
> - public void setUserFriendlyDesc(String userFriendlyDesc) {
> - this.userFriendlyDesc = userFriendlyDesc;
> - }
> -
> - public int getInputOrder() {
> - return inputOrder;
> - }
> -
> - public void setInputOrder(int inputOrder) {
> - this.inputOrder = inputOrder;
> - }
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public String getCommandLineType() {
> - return commandLineType;
> - }
> -
> - public void setCommandLineType(String commandLineType) {
> - this.commandLineType = commandLineType;
> - }
> -
> - public boolean isDataStaged() {
> - return dataStaged;
> - }
> -
> - public void setDataStaged(boolean dataStaged) {
> - this.dataStaged = dataStaged;
> - }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
> index bca1e33..15518ba 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
> @@ -37,17 +37,12 @@ public class NodeOutput implements Serializable {
> @Id
> @Column(name = "OUTPUT_KEY")
> private String outputKey;
> - @Column(name = "DATA_TYPE")
> - private String dataType;
> + @Column(name = "OUTPUT_KEY_TYPE")
> + private String outputKeyType;
> + @Column(name = "METADATA")
> + private String metadata;
> @Column(name = "VALUE")
> private String value;
> - @Column(name = "VALIDITY_TYPE")
> - private String validityType;
> - @Column(name = "DATA_MOVEMENT")
> - private boolean dataMovement;
> - @Column(name = "DATA_NAME_LOCATION")
> - private String dataNameLocation;
> -
>
> @ManyToOne(cascade= CascadeType.MERGE)
> @JoinColumn(name = "NODE_INSTANCE_ID")
> @@ -61,6 +56,14 @@ public class NodeOutput implements Serializable {
> this.nodeId = nodeId;
> }
>
> + public String getMetadata() {
> + return metadata;
> + }
> +
> + public void setMetadata(String metadata) {
> + this.metadata = metadata;
> + }
> +
> public String getValue() {
> return value;
> }
> @@ -85,35 +88,11 @@ public class NodeOutput implements Serializable {
> this.outputKey = outputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> - }
> -
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> - }
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public boolean isDataMovement() {
> - return dataMovement;
> - }
> -
> - public void setDataMovement(boolean dataMovement) {
> - this.dataMovement = dataMovement;
> - }
> -
> - public String getDataNameLocation() {
> - return dataNameLocation;
> + public String getOutputKeyType() {
> + return outputKeyType;
> }
>
> - public void setDataNameLocation(String dataNameLocation) {
> - this.dataNameLocation = dataNameLocation;
> + public void setOutputKeyType(String outputKeyType) {
> + this.outputKeyType = outputKeyType;
> }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
> index 8ce8c6d..aa2271e 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
> @@ -39,72 +39,9 @@ public class ApplicationInputResource extends
> AbstractResource {
> private static final Logger logger =
> LoggerFactory.getLogger(ApplicationInputResource.class);
> private TaskDetailResource taskDetailResource;
> private String inputKey;
> - private String dataType;
> + private String inputType;
> private String metadata;
> private String value;
> - private String appArgument;
> - private boolean standardInput;
> - private String userFriendlyDesc;
> - private int inputOrder;
> - private String validityType;
> - private String commandLineType;
> - private boolean dataStaged;
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public String getCommandLineType() {
> - return commandLineType;
> - }
> -
> - public void setCommandLineType(String commandLineType) {
> - this.commandLineType = commandLineType;
> - }
> -
> - public boolean isDataStaged() {
> - return dataStaged;
> - }
> -
> - public void setDataStaged(boolean dataStaged) {
> - this.dataStaged = dataStaged;
> - }
> -
> - public int getInputOrder() {
> - return inputOrder;
> - }
> -
> - public void setInputOrder(int inputOrder) {
> - this.inputOrder = inputOrder;
> - }
> -
> - public String getAppArgument() {
> - return appArgument;
> - }
> -
> - public void setAppArgument(String appArgument) {
> - this.appArgument = appArgument;
> - }
> -
> - public boolean isStandardInput() {
> - return standardInput;
> - }
> -
> - public void setStandardInput(boolean standardInput) {
> - this.standardInput = standardInput;
> - }
> -
> - public String getUserFriendlyDesc() {
> - return userFriendlyDesc;
> - }
> -
> - public void setUserFriendlyDesc(String userFriendlyDesc) {
> - this.userFriendlyDesc = userFriendlyDesc;
> - }
>
> public String getInputKey() {
> return inputKey;
> @@ -114,12 +51,12 @@ public class ApplicationInputResource extends
> AbstractResource {
> this.inputKey = inputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getInputType() {
> + return inputType;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setInputType(String inputType) {
> + this.inputType = inputType;
> }
>
> public String getMetadata() {
> @@ -185,14 +122,7 @@ public class ApplicationInputResource extends
> AbstractResource {
> applicationInput.setTask(taskDetail);
> applicationInput.setTaskId(taskDetail.getTaskId());
> applicationInput.setInputKey(inputKey);
> - applicationInput.setDataType(dataType);
> - applicationInput.setAppArgument(appArgument);
> - applicationInput.setStandardInput(standardInput);
> - applicationInput.setUserFriendlyDesc(userFriendlyDesc);
> - applicationInput.setInputOrder(inputOrder);
> - applicationInput.setCommandLineType(commandLineType);
> - applicationInput.setValidityType(validityType);
> - applicationInput.setDataStaged(dataStaged);
> + applicationInput.setInputKeyType(inputType);
> if (value != null){
> applicationInput.setValue(value.toCharArray());
> }
> @@ -203,14 +133,7 @@ public class ApplicationInputResource extends
> AbstractResource {
> existingInput.setTask(taskDetail);
> existingInput.setTaskId(taskDetail.getTaskId());
> existingInput.setInputKey(inputKey);
> - existingInput.setDataType(dataType);
> - existingInput.setAppArgument(appArgument);
> - existingInput.setStandardInput(standardInput);
> - existingInput.setUserFriendlyDesc(userFriendlyDesc);
> - existingInput.setInputOrder(inputOrder);
> - existingInput.setCommandLineType(commandLineType);
> - existingInput.setValidityType(validityType);
> - existingInput.setDataStaged(dataStaged);
> + existingInput.setInputKeyType(inputType);
> if (value != null){
> existingInput.setValue(value.toCharArray());
> }
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
> index 4209f87..544d6ab 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
> @@ -39,35 +39,9 @@ public class ApplicationOutputResource extends
> AbstractResource {
> private static final Logger logger =
> LoggerFactory.getLogger(ApplicationOutputResource.class);
> private TaskDetailResource taskDetailResource;
> private String outputKey;
> - private String dataType;
> + private String outputType;
> + private String metadata;
> private String value;
> - private String validityType;
> - private boolean dataMovement;
> - private String dataNameLocation;
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public boolean isDataMovement() {
> - return dataMovement;
> - }
> -
> - public void setDataMovement(boolean dataMovement) {
> - this.dataMovement = dataMovement;
> - }
> -
> - public String getDataNameLocation() {
> - return dataNameLocation;
> - }
> -
> - public void setDataNameLocation(String dataNameLocation) {
> - this.dataNameLocation = dataNameLocation;
> - }
>
> public String getOutputKey() {
> return outputKey;
> @@ -77,12 +51,20 @@ public class ApplicationOutputResource extends
> AbstractResource {
> this.outputKey = outputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getOutputType() {
> + return outputType;
> + }
> +
> + public void setOutputType(String outputType) {
> + this.outputType = outputType;
> + }
> +
> + public String getMetadata() {
> + return metadata;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setMetadata(String metadata) {
> + this.metadata = metadata;
> }
>
> public String getValue() {
> @@ -140,25 +122,21 @@ public class ApplicationOutputResource extends
> AbstractResource {
> applicationOutput.setTask(taskDetail);
> applicationOutput.setTaskId(taskDetail.getTaskId());
> applicationOutput.setOutputKey(outputKey);
> - applicationOutput.setDataType(dataType);
> - applicationOutput.setValidityType(validityType);
> - applicationOutput.setDataMovement(dataMovement);
> - applicationOutput.setDataNameLocation(dataNameLocation);
> + applicationOutput.setOutputKeyType(outputType);
> if (value != null){
> applicationOutput.setValue(value.toCharArray());
> }
> + applicationOutput.setMetadata(metadata);
>
> if (existingOutput != null) {
> existingOutput.setTask(taskDetail);
> existingOutput.setTaskId(taskDetail.getTaskId());
> existingOutput.setOutputKey(outputKey);
> - existingOutput.setDataType(dataType);
> - existingOutput.setValidityType(validityType);
> - existingOutput.setDataMovement(dataMovement);
> - existingOutput.setDataNameLocation(dataNameLocation);
> + existingOutput.setOutputKeyType(outputType);
> if (value != null){
> existingOutput.setValue(value.toCharArray());
> }
> + existingOutput.setMetadata(metadata);
> applicationOutput = em.merge(existingOutput);
> } else {
> em.persist(applicationOutput);
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
> index eaf401d..26f7ce5 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
> @@ -40,71 +40,8 @@ public class ExperimentInputResource extends
> AbstractResource {
> private ExperimentResource experimentResource;
> private String experimentKey;
> private String value;
> + private String inputType;
> private String metadata;
> - private String dataType;
> - private String appArgument;
> - private boolean standardInput;
> - private String userFriendlyDesc;
> - private int inputOrder;
> - private String validityType;
> - private String commandLineType;
> - private boolean dataStaged;
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public String getCommandLineType() {
> - return commandLineType;
> - }
> -
> - public void setCommandLineType(String commandLineType) {
> - this.commandLineType = commandLineType;
> - }
> -
> - public boolean isDataStaged() {
> - return dataStaged;
> - }
> -
> - public void setDataStaged(boolean dataStaged) {
> - this.dataStaged = dataStaged;
> - }
> -
> - public int getInputOrder() {
> - return inputOrder;
> - }
> -
> - public void setInputOrder(int inputOrder) {
> - this.inputOrder = inputOrder;
> - }
> -
> - public String getAppArgument() {
> - return appArgument;
> - }
> -
> - public void setAppArgument(String appArgument) {
> - this.appArgument = appArgument;
> - }
> -
> - public boolean isStandardInput() {
> - return standardInput;
> - }
> -
> - public void setStandardInput(boolean standardInput) {
> - this.standardInput = standardInput;
> - }
> -
> - public String getUserFriendlyDesc() {
> - return userFriendlyDesc;
> - }
> -
> - public void setUserFriendlyDesc(String userFriendlyDesc) {
> - this.userFriendlyDesc = userFriendlyDesc;
> - }
>
> public String getExperimentKey() {
> return experimentKey;
> @@ -130,12 +67,12 @@ public class ExperimentInputResource extends
> AbstractResource {
> this.experimentResource = experimentResource;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getInputType() {
> + return inputType;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setInputType(String inputType) {
> + this.inputType = inputType;
> }
>
> public String getMetadata() {
> @@ -183,15 +120,9 @@ public class ExperimentInputResource extends
> AbstractResource {
> if (value != null){
> exInput.setValue(value.toCharArray());
> }
> - exInput.setDataType(dataType);
> + exInput.setInputType(inputType);
> exInput.setMetadata(metadata);
> - exInput.setAppArgument(appArgument);
> - exInput.setStandardInput(standardInput);
> - exInput.setUserFriendlyDesc(userFriendlyDesc);
> - exInput.setInputOrder(inputOrder);
> - exInput.setCommandLineType(commandLineType);
> - exInput.setValidityType(validityType);
> - exInput.setDataStaged(dataStaged);
> +
> if (existingInput != null) {
> existingInput.setEx_key(experimentKey);
> existingInput.setExperiment(experiment);
> @@ -199,15 +130,8 @@ public class ExperimentInputResource extends
> AbstractResource {
> if (value != null){
> existingInput.setValue(value.toCharArray());
> }
> - existingInput.setDataType(dataType);
> + existingInput.setInputType(inputType);
> existingInput.setMetadata(metadata);
> - existingInput.setAppArgument(appArgument);
> - existingInput.setStandardInput(standardInput);
> - existingInput.setUserFriendlyDesc(userFriendlyDesc);
> - existingInput.setInputOrder(inputOrder);
> - existingInput.setCommandLineType(commandLineType);
> - existingInput.setValidityType(validityType);
> - existingInput.setDataStaged(dataStaged);
> exInput = em.merge(existingInput);
> } else {
> em.persist(exInput);
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
> index 983ff8b..5b2f0bb 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
> @@ -40,34 +40,8 @@ public class ExperimentOutputResource extends
> AbstractResource {
> private ExperimentResource experimentResource;
> private String experimentKey;
> private String value;
> - private String dataType;
> - private String validityType;
> - private boolean dataMovement;
> - private String dataNameLocation;
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public boolean isDataMovement() {
> - return dataMovement;
> - }
> -
> - public void setDataMovement(boolean dataMovement) {
> - this.dataMovement = dataMovement;
> - }
> -
> - public String getDataNameLocation() {
> - return dataNameLocation;
> - }
> -
> - public void setDataNameLocation(String dataNameLocation) {
> - this.dataNameLocation = dataNameLocation;
> - }
> + private String outputType;
> + private String metadata;
>
> public String getExperimentKey() {
> return experimentKey;
> @@ -93,12 +67,20 @@ public class ExperimentOutputResource extends
> AbstractResource {
> this.experimentResource = experimentResource;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getOutputType() {
> + return outputType;
> + }
> +
> + public void setOutputType(String outputType) {
> + this.outputType = outputType;
> + }
> +
> + public String getMetadata() {
> + return metadata;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setMetadata(String metadata) {
> + this.metadata = metadata;
> }
>
> public Resource create(ResourceType type) throws RegistryException {
> @@ -138,10 +120,8 @@ public class ExperimentOutputResource extends
> AbstractResource {
> if (value != null){
> exOutput.setValue(value.toCharArray());
> }
> - exOutput.setDataType(dataType);
> - exOutput.setValidityType(validityType);
> - exOutput.setDataMovement(dataMovement);
> - exOutput.setDataNameLocation(dataNameLocation);
> + exOutput.setOutputKeyType(outputType);
> + exOutput.setMetadata(metadata);
>
> if (existingOutput != null) {
> existingOutput.setEx_key(experimentKey);
> @@ -150,10 +130,8 @@ public class ExperimentOutputResource extends
> AbstractResource {
> existingOutput.setValue(value.toCharArray());
> }
> existingOutput.setExperiment_id(experiment.getExpId());
> - existingOutput.setDataType(dataType);
> - existingOutput.setValidityType(validityType);
> - existingOutput.setDataMovement(dataMovement);
> - existingOutput.setDataNameLocation(dataNameLocation);
> + existingOutput.setOutputKeyType(outputType);
> + existingOutput.setMetadata(metadata);
> exOutput = em.merge(existingOutput);
> } else {
> em.persist(exOutput);
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
> index 75fe601..138dd6c 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
> @@ -40,64 +40,9 @@ public class NodeInputResource extends AbstractResource
> {
>
> private WorkflowNodeDetailResource nodeDetailResource;
> private String inputKey;
> - private String dataType;
> + private String inputType;
> private String metadata;
> private String value;
> - private String appArgument;
> - private boolean standardInput;
> - private String userFriendlyDesc;
> - private int inputOrder;
> - private String validityType;
> - private String commandLineType;
> - private boolean dataStaged;
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public String getCommandLineType() {
> - return commandLineType;
> - }
> -
> - public void setCommandLineType(String commandLineType) {
> - this.commandLineType = commandLineType;
> - }
> -
> - public boolean isDataStaged() {
> - return dataStaged;
> - }
> -
> - public void setDataStaged(boolean dataStaged) {
> - this.dataStaged = dataStaged;
> - }
> -
> - public String getAppArgument() {
> - return appArgument;
> - }
> -
> - public void setAppArgument(String appArgument) {
> - this.appArgument = appArgument;
> - }
> -
> - public boolean isStandardInput() {
> - return standardInput;
> - }
> -
> - public void setStandardInput(boolean standardInput) {
> - this.standardInput = standardInput;
> - }
> -
> - public String getUserFriendlyDesc() {
> - return userFriendlyDesc;
> - }
> -
> - public void setUserFriendlyDesc(String userFriendlyDesc) {
> - this.userFriendlyDesc = userFriendlyDesc;
> - }
>
> public WorkflowNodeDetailResource getNodeDetailResource() {
> return nodeDetailResource;
> @@ -115,12 +60,12 @@ public class NodeInputResource extends
> AbstractResource {
> this.inputKey = inputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getInputType() {
> + return inputType;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setInputType(String inputType) {
> + this.inputType = inputType;
> }
>
> public String getMetadata() {
> @@ -139,14 +84,7 @@ public class NodeInputResource extends
> AbstractResource {
> this.value = value;
> }
>
> - public int getInputOrder() {
> - return inputOrder;
> - }
> -
> - public void setInputOrder(int inputOrder) {
> - this.inputOrder = inputOrder;
> - }
> -
> +
> public Resource create(ResourceType type) throws RegistryException {
> logger.error("Unsupported resource type for node input data
> resource.", new UnsupportedOperationException());
> throw new UnsupportedOperationException();
> @@ -185,31 +123,17 @@ public class NodeInputResource extends
> AbstractResource {
> nodeInput.setNodeDetails(nodeDetail);
> nodeInput.setNodeId(nodeDetail.getNodeId());
> nodeInput.setInputKey(inputKey);
> - nodeInput.setDataType(dataType);
> + nodeInput.setInputKeyType(inputType);
> nodeInput.setValue(value);
> nodeInput.setMetadata(metadata);
> - nodeInput.setAppArgument(appArgument);
> - nodeInput.setStandardInput(standardInput);
> - nodeInput.setUserFriendlyDesc(userFriendlyDesc);
> - nodeInput.setInputOrder(inputOrder);
> - nodeInput.setCommandLineType(commandLineType);
> - nodeInput.setValidityType(validityType);
> - nodeInput.setDataStaged(dataStaged);
>
> if (existingInput != null){
> existingInput.setNodeDetails(nodeDetail);
> existingInput.setNodeId(nodeDetail.getNodeId());
> existingInput.setInputKey(inputKey);
> - existingInput.setDataType(dataType);
> + existingInput.setInputKeyType(inputType);
> existingInput.setValue(value);
> existingInput.setMetadata(metadata);
> - existingInput.setAppArgument(appArgument);
> - existingInput.setStandardInput(standardInput);
> - existingInput.setUserFriendlyDesc(userFriendlyDesc);
> - existingInput.setInputOrder(inputOrder);
> - existingInput.setCommandLineType(commandLineType);
> - existingInput.setValidityType(validityType);
> - existingInput.setDataStaged(dataStaged);
> nodeInput = em.merge(existingInput);
> }else {
> em.persist(nodeInput);
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
> index caeae7e..164a2e0 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
> @@ -40,35 +40,9 @@ public class NodeOutputResource extends
> AbstractResource {
>
> private WorkflowNodeDetailResource nodeDetailResource;
> private String outputKey;
> - private String dataType;
> + private String outputType;
> + private String metadata;
> private String value;
> - private String validityType;
> - private boolean dataMovement;
> - private String dataNameLocation;
> -
> - public String getValidityType() {
> - return validityType;
> - }
> -
> - public void setValidityType(String validityType) {
> - this.validityType = validityType;
> - }
> -
> - public boolean isDataMovement() {
> - return dataMovement;
> - }
> -
> - public void setDataMovement(boolean dataMovement) {
> - this.dataMovement = dataMovement;
> - }
> -
> - public String getDataNameLocation() {
> - return dataNameLocation;
> - }
> -
> - public void setDataNameLocation(String dataNameLocation) {
> - this.dataNameLocation = dataNameLocation;
> - }
>
> public WorkflowNodeDetailResource getNodeDetailResource() {
> return nodeDetailResource;
> @@ -86,12 +60,20 @@ public class NodeOutputResource extends
> AbstractResource {
> this.outputKey = outputKey;
> }
>
> - public String getDataType() {
> - return dataType;
> + public String getOutputType() {
> + return outputType;
> + }
> +
> + public void setOutputType(String outputType) {
> + this.outputType = outputType;
> + }
> +
> + public String getMetadata() {
> + return metadata;
> }
>
> - public void setDataType(String dataType) {
> - this.dataType = dataType;
> + public void setMetadata(String metadata) {
> + this.metadata = metadata;
> }
>
> public String getValue() {
> @@ -141,21 +123,17 @@ public class NodeOutputResource extends
> AbstractResource {
> nodeOutput.setNode(nodeDetail);
> nodeOutput.setNodeId(nodeDetail.getNodeId());
> nodeOutput.setOutputKey(outputKey);
> - nodeOutput.setDataType(dataType);
> + nodeOutput.setOutputKeyType(outputType);
> nodeOutput.setValue(value);
> - nodeOutput.setValidityType(validityType);
> - nodeOutput.setDataMovement(dataMovement);
> - nodeOutput.setDataNameLocation(dataNameLocation);
> + nodeOutput.setMetadata(metadata);
>
> if (existingOutput != null) {
> existingOutput.setNode(nodeDetail);
> existingOutput.setNodeId(nodeDetail.getNodeId());
> existingOutput.setOutputKey(outputKey);
> - existingOutput.setDataType(dataType);
> + existingOutput.setOutputKeyType(outputType);
> existingOutput.setValue(value);
> - existingOutput.setValidityType(validityType);
> - existingOutput.setDataMovement(dataMovement);
> - existingOutput.setDataNameLocation(dataNameLocation);
> + existingOutput.setMetadata(metadata);
> nodeOutput = em.merge(existingOutput);
> } else {
> em.persist(nodeOutput);
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
> index e131a47..3218ecd 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
> @@ -513,17 +513,9 @@ public class Utils {
> if (o != null){
> ExperimentResource experimentResource =
> (ExperimentResource)createExperiment(o.getExperiment());
> eInputResource.setExperimentResource(experimentResource);
> - eInputResource.setDataType(o.getDataType());
> + eInputResource.setInputType(o.getInputType());
> eInputResource.setMetadata(o.getMetadata());
> eInputResource.setExperimentKey(o.getEx_key());
> - eInputResource.setAppArgument(o.getAppArgument());
> - eInputResource.setInputOrder(o.getInputOrder());
> - eInputResource.setStandardInput(o.isStandardInput());
> - eInputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
> - eInputResource.setValidityType(o.getValidityType());
> - eInputResource.setCommandLineType(o.getCommandLineType());
> - eInputResource.setDataStaged(o.isDataStaged());
> -
> if (o.getValue() != null){
> eInputResource.setValue(new String(o.getValue()));
> }
> @@ -541,10 +533,8 @@ public class Utils {
> if (o.getValue() != null){
> eOutputResource.setValue(new String(o.getValue()));
> }
> - eOutputResource.setDataType(o.getDataType());
> - eOutputResource.setValidityType(o.getValidityType());
> - eOutputResource.setDataMovement(o.isDataMovement());
> - eOutputResource.setDataNameLocation(o.getDataNameLocation());
> + eOutputResource.setOutputType(o.getOutputKeyType());
> + eOutputResource.setMetadata(o.getMetadata());
> }
> return eOutputResource;
> }
> @@ -611,14 +601,7 @@ public class Utils {
> TaskDetailResource taskDetailResource =
> (TaskDetailResource)createTaskDetail(o.getTask());
> inputResource.setTaskDetailResource(taskDetailResource);
> inputResource.setInputKey(o.getInputKey());
> - inputResource.setDataType(o.getDataType());
> - inputResource.setAppArgument(o.getAppArgument());
> - inputResource.setInputOrder(o.getInputOrder());
> - inputResource.setStandardInput(o.isStandardInput());
> - inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
> - inputResource.setValidityType(o.getValidityType());
> - inputResource.setCommandLineType(o.getCommandLineType());
> - inputResource.setDataStaged(o.isDataStaged());
> + inputResource.setInputType(o.getInputKeyType());
> if (o.getValue() != null){
> inputResource.setValue(new String(o.getValue()));
> }
> @@ -632,14 +615,12 @@ public class Utils {
> if (o != null){
> TaskDetailResource taskDetailResource =
> (TaskDetailResource)createTaskDetail(o.getTask());
> outputResource.setTaskDetailResource(taskDetailResource);
> - outputResource.setDataType(o.getDataType());
> + outputResource.setOutputType(o.getOutputKeyType());
> outputResource.setOutputKey(o.getOutputKey());
> if (o.getValue() != null){
> outputResource.setValue(new String(o.getValue()));
> }
> - outputResource.setValidityType(o.getValidityType());
> - outputResource.setDataMovement(o.isDataMovement());
> - outputResource.setDataNameLocation(o.getDataNameLocation());
> + outputResource.setMetadata(o.getMetadata());
> }
> return outputResource;
> }
> @@ -650,16 +631,9 @@ public class Utils {
> WorkflowNodeDetailResource nodeDetailResource =
> (WorkflowNodeDetailResource)createWorkflowNodeDetail(o.getNodeDetails());
> inputResource.setNodeDetailResource(nodeDetailResource);
> inputResource.setInputKey(o.getInputKey());
> - inputResource.setDataType(o.getDataType());
> + inputResource.setInputType(o.getInputKeyType());
> inputResource.setValue(o.getValue());
> inputResource.setMetadata(o.getMetadata());
> - inputResource.setAppArgument(o.getAppArgument());
> - inputResource.setInputOrder(o.getInputOrder());
> - inputResource.setStandardInput(o.isStandardInput());
> - inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
> - inputResource.setValidityType(o.getValidityType());
> - inputResource.setCommandLineType(o.getCommandLineType());
> - inputResource.setDataStaged(o.isDataStaged());
> }
> return inputResource;
> }
> @@ -669,12 +643,10 @@ public class Utils {
> if (o != null){
> WorkflowNodeDetailResource nodeDetailResource =
> (WorkflowNodeDetailResource)createWorkflowNodeDetail(o.getNode());
> outputResource.setNodeDetailResource(nodeDetailResource);
> - outputResource.setDataType(o.getDataType());
> + outputResource.setOutputType(o.getOutputKeyType());
> outputResource.setOutputKey(o.getOutputKey());
> outputResource.setValue(o.getValue());
> - outputResource.setValidityType(o.getValidityType());
> - outputResource.setDataMovement(o.isDataMovement());
> - outputResource.setDataNameLocation(o.getDataNameLocation());
> + outputResource.setMetadata(o.getMetadata());
> }
>
> return outputResource;
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
> index 9818e6f..306bd3f 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
> +++
> b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
> @@ -24,7 +24,9 @@ package
> org.apache.airavata.persistance.registry.jpa.utils;
> import java.util.ArrayList;
> import java.util.List;
>
> -import org.apache.airavata.model.appcatalog.appinterface.*;
> +import org.apache.airavata.model.appcatalog.appinterface.DataType;
> +import
> org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
> +import
> org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
> import org.apache.airavata.model.workspace.Project;
> import org.apache.airavata.model.workspace.experiment.ActionableGroup;
> import
> org.apache.airavata.model.workspace.experiment.AdvancedInputDataHandling;
> @@ -184,61 +186,28 @@ public class ThriftDataModelConversion {
> ExperimentInputResource expInput =
> (ExperimentInputResource) object;
> dataObjectType.setName(expInput.getExperimentKey());
> dataObjectType.setValue(expInput.getValue());
> - if (expInput.getDataType() != null){
> -
> dataObjectType.setType(DataType.valueOf(expInput.getDataType()));
> + if (expInput.getInputType() != null){
> +
> dataObjectType.setType(DataType.valueOf(expInput.getInputType()));
> }
> dataObjectType.setMetaData(expInput.getMetadata());
> -
> dataObjectType.setApplicationArgument(expInput.getAppArgument());
> -
> dataObjectType.setStandardInput(expInput.isStandardInput());
> -
> dataObjectType.setUserFriendlyDescription(expInput.getUserFriendlyDesc());
> - dataObjectType.setInputOrder(expInput.getInputOrder());
> - if (expInput.getValidityType() != null){
> -
> dataObjectType.setInputValid(ValidityType.valueOf(expInput.getValidityType()));
> - }
> - if (expInput.getCommandLineType() != null){
> -
> dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(expInput.getCommandLineType()));
> - }
> - dataObjectType.setDataStaged(expInput.isDataStaged());
> return dataObjectType;
> }else if (object instanceof NodeInputResource){
> NodeInputResource nodeInputResource =
> (NodeInputResource)object;
> dataObjectType.setName(nodeInputResource.getInputKey());
> dataObjectType.setValue(nodeInputResource.getValue());
> - if (nodeInputResource.getDataType() != null){
> -
> dataObjectType.setType(DataType.valueOf(nodeInputResource.getDataType()));
> + if (nodeInputResource.getInputType() != null){
> +
> dataObjectType.setType(DataType.valueOf(nodeInputResource.getInputType()));
> }
>
> dataObjectType.setMetaData(nodeInputResource.getMetadata());
> -
> dataObjectType.setApplicationArgument(nodeInputResource.getAppArgument());
> -
> dataObjectType.setStandardInput(nodeInputResource.isStandardInput());
> -
> dataObjectType.setUserFriendlyDescription(nodeInputResource.getUserFriendlyDesc());
> -
> dataObjectType.setInputOrder(nodeInputResource.getInputOrder());
> - if (nodeInputResource.getValidityType() != null){
> -
> dataObjectType.setInputValid(ValidityType.valueOf(nodeInputResource.getValidityType()));
> - }
> - if (nodeInputResource.getCommandLineType() != null){
> -
> dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(nodeInputResource.getCommandLineType()));
> - }
> -
> dataObjectType.setDataStaged(nodeInputResource.isDataStaged());
> return dataObjectType;
> }else if (object instanceof ApplicationInputResource){
> ApplicationInputResource inputResource =
> (ApplicationInputResource)object;
> dataObjectType.setName(inputResource.getInputKey());
> dataObjectType.setValue(inputResource.getValue());
> - if (inputResource.getDataType() != null){
> -
> dataObjectType.setType(DataType.valueOf(inputResource.getDataType()));
> + if (inputResource.getInputType() != null){
> +
> dataObjectType.setType(DataType.valueOf(inputResource.getInputType()));
> }
> dataObjectType.setMetaData(inputResource.getMetadata());
> -
> dataObjectType.setApplicationArgument(inputResource.getAppArgument());
> -
> dataObjectType.setStandardInput(inputResource.isStandardInput());
> -
> dataObjectType.setUserFriendlyDescription(inputResource.getUserFriendlyDesc());
> -
> dataObjectType.setInputOrder(inputResource.getInputOrder());
> - if (inputResource.getValidityType() != null){
> -
> dataObjectType.setInputValid(ValidityType.valueOf(inputResource.getValidityType()));
> - }
> - if (inputResource.getCommandLineType() != null){
> -
> dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(inputResource.getCommandLineType()));
> - }
> -
> dataObjectType.setDataStaged(inputResource.isDataStaged());
> return dataObjectType;
> }else {
> return null;
> @@ -254,40 +223,28 @@ public class ThriftDataModelConversion {
> ExperimentOutputResource expOutput =
> (ExperimentOutputResource)object;
> dataObjectType.setName(expOutput.getExperimentKey());
> dataObjectType.setValue(expOutput.getValue());
> - if (expOutput.getDataType() != null){
> -
> dataObjectType.setType(DataType.valueOf(expOutput.getDataType()));
> - }
> - if (expOutput.getValidityType() != null){
> -
> dataObjectType.setValidityType(ValidityType.valueOf(expOutput.getValidityType()));
> + if (expOutput.getOutputType() != null){
> +
> dataObjectType.setType(DataType.valueOf(expOutput.getOutputType()));
> }
> -
> dataObjectType.setDataMovement(expOutput.isDataMovement());
> -
> dataObjectType.setDataNameLocation(expOutput.getDataNameLocation());
> +// dataObjectType.setMetaData(expOutput.getMetadata());
> return dataObjectType;
> }else if (object instanceof NodeOutputResource){
> NodeOutputResource nodeOutputResource =
> (NodeOutputResource)object;
> dataObjectType.setName(nodeOutputResource.getOutputKey());
> dataObjectType.setValue(nodeOutputResource.getValue());
> - if (nodeOutputResource.getDataType() != null){
> -
> dataObjectType.setType(DataType.valueOf(nodeOutputResource.getDataType()));
> + if (nodeOutputResource.getOutputType() != null){
> +
> dataObjectType.setType(DataType.valueOf(nodeOutputResource.getOutputType()));
> }
> - if (nodeOutputResource.getValidityType() != null){
> -
> dataObjectType.setValidityType(ValidityType.valueOf(nodeOutputResource.getValidityType()));
> - }
> -
> dataObjectType.setDataMovement(nodeOutputResource.isDataMovement());
> -
> dataObjectType.setDataNameLocation(nodeOutputResource.getDataNameLocation());
> +//
> dataObjectType.setMetaData(nodeOutputResource.getMetadata());
> return dataObjectType;
> }else if (object instanceof ApplicationOutputResource){
> ApplicationOutputResource outputResource =
> (ApplicationOutputResource)object;
> dataObjectType.setName(outputResource.getOutputKey());
> dataObjectType.setValue(outputResource.getValue());
> - if (outputResource.getDataType() != null){
> -
> dataObjectType.setType(DataType.valueOf(outputResource.getDataType()));
> - }
> - if (outputResource.getValidityType() != null){
> -
> dataObjectType.setValidityType(ValidityType.valueOf(outputResource.getValidityType()));
> + if (outputResource.getOutputType() != null){
> +
> dataObjectType.setType(DataType.valueOf(outputResource.getOutputType()));
> }
> -
> dataObjectType.setDataMovement(outputResource.isDataMovement());
> -
> dataObjectType.setDataNameLocation(outputResource.getDataNameLocation());
> +//
> dataObjectType.setMetaData(outputResource.getMetadata());
> return dataObjectType;
> }else {
> return null;
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
> b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
> index c1bd458..9ed5ca9 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
> +++
> b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
> @@ -125,16 +125,9 @@ CREATE TABLE EXPERIMENT_INPUT
> (
> EXPERIMENT_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + INPUT_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> VALUE CLOB,
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
> FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
> ON DELETE CASCADE
> );
> @@ -143,11 +136,9 @@ CREATE TABLE EXPERIMENT_OUTPUT
> (
> EXPERIMENT_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE CLOB,
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
> FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
> ON DELETE CASCADE
> );
> @@ -201,16 +192,9 @@ CREATE TABLE APPLICATION_INPUT
> (
> TASK_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + INPUT_KEY_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> VALUE CLOB,
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(TASK_ID,INPUT_KEY),
> FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE
> CASCADE
> );
> @@ -219,11 +203,9 @@ CREATE TABLE APPLICATION_OUTPUT
> (
> TASK_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE CLOB,
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(TASK_ID,OUTPUT_KEY),
> FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE
> CASCADE
> );
> @@ -232,16 +214,9 @@ CREATE TABLE NODE_INPUT
> (
> NODE_INSTANCE_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + INPUT_KEY_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> VALUE VARCHAR(255),
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
> FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES
> WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
> );
> @@ -250,11 +225,9 @@ CREATE TABLE NODE_OUTPUT
> (
> NODE_INSTANCE_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE VARCHAR(255),
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
> FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES
> WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
> );
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
> b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
> index 7f7dfab..286a8fb 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
> +++
> b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
> @@ -125,16 +125,9 @@ CREATE TABLE EXPERIMENT_INPUT
> (
> EXPERIMENT_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> + INPUT_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> VALUE LONGTEXT,
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
> FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
> ON DELETE CASCADE
> );
> @@ -143,11 +136,9 @@ CREATE TABLE EXPERIMENT_OUTPUT
> (
> EXPERIMENT_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE LONGTEXT,
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
> FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
> ON DELETE CASCADE
> );
> @@ -182,16 +173,9 @@ CREATE TABLE APPLICATION_INPUT
> (
> TASK_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> + INPUT_KEY_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> VALUE LONGTEXT,
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(TASK_ID,INPUT_KEY),
> FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE
> CASCADE
> );
> @@ -200,11 +184,9 @@ CREATE TABLE APPLICATION_OUTPUT
> (
> TASK_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE LONGTEXT,
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(TASK_ID,OUTPUT_KEY),
> FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE
> CASCADE
> );
> @@ -213,16 +195,9 @@ CREATE TABLE NODE_INPUT
> (
> NODE_INSTANCE_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> + INPUT_KEY_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> VALUE VARCHAR(255),
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
> FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES
> WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
> );
> @@ -231,11 +206,9 @@ CREATE TABLE NODE_OUTPUT
> (
> NODE_INSTANCE_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE VARCHAR(255),
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
> FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES
> WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
> );
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
> b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
> index a46e196..318b044 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
> +++
> b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
> @@ -53,7 +53,7 @@ public class ExperimentInputResourceTest extends
> AbstractResourceTest {
> experimentInputResource.setExperimentResource(experimentResource);
> experimentInputResource.setExperimentKey("testKey");
> experimentInputResource.setValue("testValue");
> - experimentInputResource.setDataType("string");
> + experimentInputResource.setInputType("string");
> experimentInputResource.save();
> }
>
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
> b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
> index 696db36..ad8ae7f 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
> +++
> b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
> @@ -54,7 +54,7 @@ public class ExperimentOutputResourceTest extends
> AbstractResourceTest {
> outputResource.setExperimentResource(experimentResource);
> outputResource.setExperimentKey("testKey");
> outputResource.setValue("testValue");
> - outputResource.setDataType("string");
> + outputResource.setOutputType("string");
> outputResource.save();
> }
>
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
> ----------------------------------------------------------------------
> diff --git
> a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
> b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
> index c1bd458..9ed5ca9 100644
> ---
> a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
> +++
> b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
> @@ -125,16 +125,9 @@ CREATE TABLE EXPERIMENT_INPUT
> (
> EXPERIMENT_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + INPUT_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> VALUE CLOB,
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
> FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
> ON DELETE CASCADE
> );
> @@ -143,11 +136,9 @@ CREATE TABLE EXPERIMENT_OUTPUT
> (
> EXPERIMENT_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE CLOB,
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
> FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
> ON DELETE CASCADE
> );
> @@ -201,16 +192,9 @@ CREATE TABLE APPLICATION_INPUT
> (
> TASK_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + INPUT_KEY_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> VALUE CLOB,
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(TASK_ID,INPUT_KEY),
> FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE
> CASCADE
> );
> @@ -219,11 +203,9 @@ CREATE TABLE APPLICATION_OUTPUT
> (
> TASK_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE CLOB,
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(TASK_ID,OUTPUT_KEY),
> FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE
> CASCADE
> );
> @@ -232,16 +214,9 @@ CREATE TABLE NODE_INPUT
> (
> NODE_INSTANCE_ID VARCHAR(255),
> INPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + INPUT_KEY_TYPE VARCHAR(255),
> METADATA VARCHAR(255),
> - APP_ARGUMENT VARCHAR(255),
> - STANDARD_INPUT SMALLINT,
> - USER_FRIENDLY_DESC VARCHAR(255),
> VALUE VARCHAR(255),
> - INPUT_ORDER INTEGER,
> - VALIDITY_TYPE VARCHAR(255),
> - COMMANDLINE_TYPE VARCHAR(255),
> - DATA_STAGED SMALLINT,
> PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
> FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES
> WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
> );
> @@ -250,11 +225,9 @@ CREATE TABLE NODE_OUTPUT
> (
> NODE_INSTANCE_ID VARCHAR(255),
> OUTPUT_KEY VARCHAR(255) NOT NULL,
> - DATA_TYPE VARCHAR(255),
> + OUTPUT_KEY_TYPE VARCHAR(255),
> + METADATA VARCHAR(255),
> VALUE VARCHAR(255),
> - VALIDITY_TYPE VARCHAR(255),
> - DATA_MOVEMENT SMALLINT,
> - DATA_NAME_LOCATION VARCHAR(255),
> PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
> FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES
> WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
> );
>
>
> http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
> ----------------------------------------------------------------------
> diff --git
> a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
> b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
> index 1f23601..fa4fd32 100644
> ---
> a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
> +++
> b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
> @@ -1050,7 +1050,7 @@ public class WorkflowInterpreter implements
> AbstractActivityListener{
> Node fromNode = dataPort.getFromNode();
> String portInputValue = null;
> if (fromNode instanceof InputNode){
> - portInputValue = (String) ((InputNode)
> fromNode).getDefaultValue();
> + portInputValue = (String) ((InputNode)
> fromNode).getDefaultValue();
> } else if (fromNode instanceof WSNode){
> Map<String, String> outputData =
> nodeOutputData.get(fromNode);
> portInputValue = outputData.get(dataPort.getName());
> @@ -1058,17 +1058,9 @@ public class WorkflowInterpreter implements
> AbstractActivityListener{
> portInputValue =
> outputData.get(dataPort.getEdge(0).getFromPort().getName());
> }
> }
> - // 123456789
> - InputDataObjectType elem = new
> InputDataObjectType();
> - elem.setName(dataPort.getName());
> + InputDataObjectType elem = new InputDataObjectType();
> + elem.setName(dataPort.getName());
> elem.setValue(portInputValue);
> - if (dataPort instanceof WSPort) {
> - WSPort port = (WSPort) dataPort;
> -
> elem.setInputOrder(port.getComponentPort().getInputOrder());
> - elem.setApplicationArgument(
> -
> (port.getComponentPort().getApplicationArgument() != null ?
> port.getComponentPort().getApplicationArgument() : ""));
> - }
> -
> nodeDetails.addToNodeInputs(elem);
> }
> try {
>
>
--
Best Regards,
Shameera Rathnayaka.
email: shameera AT apache.org , shameerainfo AT gmail.com
Blog : http://shameerarathnayaka.blogspot.com/
[2/4] airavata git commit: Revert "Merge branch 'master' of"
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index 5768a0d..edbf39e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -271,11 +271,9 @@ public class ExperimentRegistry {
resource.setExperimentKey(input.getName());
resource.setValue(input.getValue());
if (input.getType() != null){
- resource.setDataType(input.getType().toString());
+ resource.setInputType(input.getType().toString());
}
resource.setMetadata(input.getMetaData());
- resource.setAppArgument(input.getApplicationArgument());
- resource.setInputOrder(input.getInputOrder());
resource.save();
}
} catch (Exception e) {
@@ -292,11 +290,9 @@ public class ExperimentRegistry {
if (exinput.getExperimentKey().equals(input.getName())) {
exinput.setValue(input.getValue());
if (input.getType() != null){
- exinput.setDataType(input.getType().toString());
+ exinput.setInputType(input.getType().toString());
}
exinput.setMetadata(input.getMetaData());
- exinput.setAppArgument(input.getApplicationArgument());
- exinput.setInputOrder(input.getInputOrder());
exinput.save();
}
}
@@ -317,7 +313,7 @@ public class ExperimentRegistry {
resource.setExperimentKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.get());
resource.save();
@@ -340,7 +336,7 @@ public class ExperimentRegistry {
resource.setExperimentKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.getMetaData());
resource.save();
@@ -363,7 +359,7 @@ public class ExperimentRegistry {
resource.setOutputKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.getMetaData());
resource.save();
@@ -386,7 +382,7 @@ public class ExperimentRegistry {
resource.setOutputKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.getMetaData());
resource.save();
@@ -409,7 +405,7 @@ public class ExperimentRegistry {
resource.setOutputKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.getMetaData());
resource.save();
@@ -817,11 +813,9 @@ public class ExperimentRegistry {
resource.setInputKey(input.getName());
resource.setValue(input.getValue());
if (input.getType() != null){
- resource.setDataType(input.getType().toString());
+ resource.setInputType(input.getType().toString());
}
resource.setMetadata(input.getMetaData());
- resource.setAppArgument(input.getApplicationArgument());
- resource.setInputOrder(input.getInputOrder());
resource.save();
}
} catch (Exception e) {
@@ -840,11 +834,9 @@ public class ExperimentRegistry {
resource.setInputKey(input.getName());
resource.setValue(input.getValue());
if (input.getType() != null){
- resource.setDataType(input.getType().toString());
+ resource.setInputType(input.getType().toString());
}
resource.setMetadata(input.getMetaData());
- resource.setAppArgument(input.getApplicationArgument());
- resource.setInputOrder(input.getInputOrder());
resource.save();
}
}
@@ -999,11 +991,9 @@ public class ExperimentRegistry {
resource.setInputKey(input.getName());
resource.setValue(input.getValue());
if (input.getType() != null){
- resource.setDataType(input.getType().toString());
+ resource.setInputType(input.getType().toString());
}
resource.setMetadata(input.getMetaData());
- resource.setAppArgument(input.getApplicationArgument());
- resource.setInputOrder(input.getInputOrder());
resource.save();
}
} catch (Exception e) {
@@ -1021,7 +1011,7 @@ public class ExperimentRegistry {
resource.setOutputKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.getMetaData());
resource.save();
@@ -1045,7 +1035,7 @@ public class ExperimentRegistry {
resource.setOutputKey(output.getName());
resource.setValue(output.getValue());
if (output.getType() != null){
- resource.setDataType(output.getType().toString());
+ resource.setOutputType(output.getType().toString());
}
// resource.setMetadata(output.getMetaData());
resource.save();
@@ -1066,11 +1056,9 @@ public class ExperimentRegistry {
resource.setInputKey(input.getName());
resource.setValue(input.getValue());
if (input.getType() != null){
- resource.setDataType(input.getType().toString());
+ resource.setInputType(input.getType().toString());
}
resource.setMetadata(input.getMetaData());
- resource.setAppArgument(input.getApplicationArgument());
- resource.setInputOrder(input.getInputOrder());
resource.save();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
index 2e68768..2e4d2b2 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationInput.java
@@ -37,44 +37,18 @@ public class ApplicationInput implements Serializable {
@Id
@Column(name = "INPUT_KEY")
private String inputKey;
- @Column(name = "DATA_TYPE")
- private String dataType;
+ @Column(name = "INPUT_KEY_TYPE")
+ private String inputKeyType;
@Column(name = "METADATA")
private String metadata;
@Lob
@Column(name = "VALUE")
private char[] value;
- @Column(name = "APP_ARGUMENT")
- private String appArgument;
-
- @Column(name = "INPUT_ORDER")
- private int inputOrder;
-
- @Column(name = "STANDARD_INPUT")
- private boolean standardInput;
-
- @Column(name = "USER_FRIENDLY_DESC")
- private String userFriendlyDesc;
-
- @Column(name="VALIDITY_TYPE")
- private String validityType;
- @Column(name="COMMANDLINE_TYPE")
- private String commandLineType;
- @Column(name = "DATA_STAGED")
- private boolean dataStaged;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "TASK_ID")
private TaskDetail task;
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
public String getTaskId() {
return taskId;
}
@@ -91,12 +65,12 @@ public class ApplicationInput implements Serializable {
this.inputKey = inputKey;
}
- public String getDataType() {
- return dataType;
+ public String getInputKeyType() {
+ return inputKeyType;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setInputKeyType(String inputKeyType) {
+ this.inputKeyType = inputKeyType;
}
public String getMetadata() {
@@ -122,52 +96,4 @@ public class ApplicationInput implements Serializable {
public void setTask(TaskDetail task) {
this.task = task;
}
-
- public String getAppArgument() {
- return appArgument;
- }
-
- public void setAppArgument(String appArgument) {
- this.appArgument = appArgument;
- }
-
- public boolean isStandardInput() {
- return standardInput;
- }
-
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public String getUserFriendlyDesc() {
- return userFriendlyDesc;
- }
-
- public void setUserFriendlyDesc(String userFriendlyDesc) {
- this.userFriendlyDesc = userFriendlyDesc;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
index b13c842..e6f9efa 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ApplicationOutput.java
@@ -37,19 +37,14 @@ public class ApplicationOutput implements Serializable {
@Id
@Column(name = "OUTPUT_KEY")
private String outputKey;
- @Column(name = "DATA_TYPE")
- private String dataType;
+ @Column(name = "OUTPUT_KEY_TYPE")
+ private String outputKeyType;
+ @Column(name = "METADATA")
+ private String metadata;
@Lob
@Column(name = "VALUE")
private char[] value;
- @Column(name = "VALIDITY_TYPE")
- private String validityType;
- @Column(name = "DATA_MOVEMENT")
- private boolean dataMovement;
- @Column(name = "DATA_NAME_LOCATION")
- private String dataNameLocation;
-
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "TASK_ID")
private TaskDetail task;
@@ -62,6 +57,14 @@ public class ApplicationOutput implements Serializable {
this.taskId = taskId;
}
+ public String getMetadata() {
+ return metadata;
+ }
+
+ public void setMetadata(String metadata) {
+ this.metadata = metadata;
+ }
+
public char[] getValue() {
return value;
}
@@ -86,35 +89,11 @@ public class ApplicationOutput implements Serializable {
this.outputKey = outputKey;
}
- public String getDataType() {
- return dataType;
- }
-
- public void setDataType(String dataType) {
- this.dataType = dataType;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
+ public String getOutputKeyType() {
+ return outputKeyType;
}
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
+ public void setOutputKeyType(String outputKeyType) {
+ this.outputKeyType = outputKeyType;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
index c174bce..5d7bbe6 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
@@ -43,43 +43,16 @@ public class Experiment_Input implements Serializable {
@Column(name = "VALUE")
private char[] value;
- @Column(name = "DATA_TYPE")
- private String dataType;
-
- @Column(name = "APP_ARGUMENT")
- private String appArgument;
-
- @Column(name = "STANDARD_INPUT")
- private boolean standardInput;
-
- @Column(name = "USER_FRIENDLY_DESC")
- private String userFriendlyDesc;
+ @Column(name = "INPUT_TYPE")
+ private String inputType;
@Column(name = "METADATA")
private String metadata;
- @Column(name = "INPUT_ORDER")
- private int inputOrder;
-
- @Column(name="VALIDITY_TYPE")
- private String validityType;
- @Column(name="COMMANDLINE_TYPE")
- private String commandLineType;
- @Column(name = "DATA_STAGED")
- private boolean dataStaged;
-
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID")
private Experiment experiment;
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
public String getExperiment_id() {
return experiment_id;
}
@@ -104,12 +77,12 @@ public class Experiment_Input implements Serializable {
this.value = value;
}
- public String getDataType() {
- return dataType;
+ public String getInputType() {
+ return inputType;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setInputType(String inputType) {
+ this.inputType = inputType;
}
public String getMetadata() {
@@ -127,52 +100,4 @@ public class Experiment_Input implements Serializable {
public void setExperiment(Experiment experiment) {
this.experiment = experiment;
}
-
- public String getAppArgument() {
- return appArgument;
- }
-
- public void setAppArgument(String appArgument) {
- this.appArgument = appArgument;
- }
-
- public boolean isStandardInput() {
- return standardInput;
- }
-
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public String getUserFriendlyDesc() {
- return userFriendlyDesc;
- }
-
- public void setUserFriendlyDesc(String userFriendlyDesc) {
- this.userFriendlyDesc = userFriendlyDesc;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
index c40a5ff..fd77403 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
@@ -41,15 +41,10 @@ public class Experiment_Output implements Serializable {
@Lob
@Column(name = "VALUE")
private char[] value;
- @Column(name = "DATA_TYPE")
- private String dataType;
-
- @Column(name = "VALIDITY_TYPE")
- private String validityType;
- @Column(name = "DATA_MOVEMENT")
- private boolean dataMovement;
- @Column(name = "DATA_NAME_LOCATION")
- private String dataNameLocation;
+ @Column(name = "METADATA")
+ private String metadata;
+ @Column(name = "OUTPUT_KEY_TYPE")
+ private String outputKeyType;
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID")
@@ -79,43 +74,27 @@ public class Experiment_Output implements Serializable {
this.value = value;
}
- public String getDataType() {
- return dataType;
- }
-
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public String getMetadata() {
+ return metadata;
}
- public Experiment getExperiment() {
- return experiment;
- }
-
- public void setExperiment(Experiment experiment) {
- this.experiment = experiment;
+ public void setMetadata(String metadata) {
+ this.metadata = metadata;
}
- public String getValidityType() {
- return validityType;
+ public String getOutputKeyType() {
+ return outputKeyType;
}
- public void setValidityType(String validityType) {
- this.validityType = validityType;
+ public void setOutputKeyType(String outputKeyType) {
+ this.outputKeyType = outputKeyType;
}
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
+ public Experiment getExperiment() {
+ return experiment;
}
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
+ public void setExperiment(Experiment experiment) {
+ this.experiment = experiment;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
index 6d090e8..9bfb917 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
@@ -37,29 +37,12 @@ public class NodeInput implements Serializable {
@Id
@Column(name = "INPUT_KEY")
private String inputKey;
- @Column(name = "DATA_TYPE")
- private String dataType;
+ @Column(name = "INPUT_KEY_TYPE")
+ private String inputKeyType;
@Column(name = "METADATA")
private String metadata;
@Column(name = "VALUE")
private String value;
- @Column(name = "APP_ARGUMENT")
- private String appArgument;
- @Column(name = "INPUT_ORDER")
- private int inputOrder;
-
- @Column(name = "STANDARD_INPUT")
- private boolean standardInput;
-
- @Column(name = "USER_FRIENDLY_DESC")
- private String userFriendlyDesc;
-
- @Column(name="VALIDITY_TYPE")
- private String validityType;
- @Column(name="COMMANDLINE_TYPE")
- private String commandLineType;
- @Column(name = "DATA_STAGED")
- private boolean dataStaged;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "NODE_INSTANCE_ID")
@@ -73,12 +56,12 @@ public class NodeInput implements Serializable {
this.inputKey = inputKey;
}
- public String getDataType() {
- return dataType;
+ public String getInputKeyType() {
+ return inputKeyType;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setInputKeyType(String inputKeyType) {
+ this.inputKeyType = inputKeyType;
}
public String getMetadata() {
@@ -112,60 +95,4 @@ public class NodeInput implements Serializable {
public void setNodeDetails(WorkflowNodeDetail nodeDetails) {
this.nodeDetails = nodeDetails;
}
-
- public String getAppArgument() {
- return appArgument;
- }
-
- public void setAppArgument(String appArgument) {
- this.appArgument = appArgument;
- }
-
- public boolean isStandardInput() {
- return standardInput;
- }
-
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public String getUserFriendlyDesc() {
- return userFriendlyDesc;
- }
-
- public void setUserFriendlyDesc(String userFriendlyDesc) {
- this.userFriendlyDesc = userFriendlyDesc;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
index bca1e33..15518ba 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
@@ -37,17 +37,12 @@ public class NodeOutput implements Serializable {
@Id
@Column(name = "OUTPUT_KEY")
private String outputKey;
- @Column(name = "DATA_TYPE")
- private String dataType;
+ @Column(name = "OUTPUT_KEY_TYPE")
+ private String outputKeyType;
+ @Column(name = "METADATA")
+ private String metadata;
@Column(name = "VALUE")
private String value;
- @Column(name = "VALIDITY_TYPE")
- private String validityType;
- @Column(name = "DATA_MOVEMENT")
- private boolean dataMovement;
- @Column(name = "DATA_NAME_LOCATION")
- private String dataNameLocation;
-
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "NODE_INSTANCE_ID")
@@ -61,6 +56,14 @@ public class NodeOutput implements Serializable {
this.nodeId = nodeId;
}
+ public String getMetadata() {
+ return metadata;
+ }
+
+ public void setMetadata(String metadata) {
+ this.metadata = metadata;
+ }
+
public String getValue() {
return value;
}
@@ -85,35 +88,11 @@ public class NodeOutput implements Serializable {
this.outputKey = outputKey;
}
- public String getDataType() {
- return dataType;
- }
-
- public void setDataType(String dataType) {
- this.dataType = dataType;
- }
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
+ public String getOutputKeyType() {
+ return outputKeyType;
}
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
+ public void setOutputKeyType(String outputKeyType) {
+ this.outputKeyType = outputKeyType;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
index 8ce8c6d..aa2271e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationInputResource.java
@@ -39,72 +39,9 @@ public class ApplicationInputResource extends AbstractResource {
private static final Logger logger = LoggerFactory.getLogger(ApplicationInputResource.class);
private TaskDetailResource taskDetailResource;
private String inputKey;
- private String dataType;
+ private String inputType;
private String metadata;
private String value;
- private String appArgument;
- private boolean standardInput;
- private String userFriendlyDesc;
- private int inputOrder;
- private String validityType;
- private String commandLineType;
- private boolean dataStaged;
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getAppArgument() {
- return appArgument;
- }
-
- public void setAppArgument(String appArgument) {
- this.appArgument = appArgument;
- }
-
- public boolean isStandardInput() {
- return standardInput;
- }
-
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public String getUserFriendlyDesc() {
- return userFriendlyDesc;
- }
-
- public void setUserFriendlyDesc(String userFriendlyDesc) {
- this.userFriendlyDesc = userFriendlyDesc;
- }
public String getInputKey() {
return inputKey;
@@ -114,12 +51,12 @@ public class ApplicationInputResource extends AbstractResource {
this.inputKey = inputKey;
}
- public String getDataType() {
- return dataType;
+ public String getInputType() {
+ return inputType;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setInputType(String inputType) {
+ this.inputType = inputType;
}
public String getMetadata() {
@@ -185,14 +122,7 @@ public class ApplicationInputResource extends AbstractResource {
applicationInput.setTask(taskDetail);
applicationInput.setTaskId(taskDetail.getTaskId());
applicationInput.setInputKey(inputKey);
- applicationInput.setDataType(dataType);
- applicationInput.setAppArgument(appArgument);
- applicationInput.setStandardInput(standardInput);
- applicationInput.setUserFriendlyDesc(userFriendlyDesc);
- applicationInput.setInputOrder(inputOrder);
- applicationInput.setCommandLineType(commandLineType);
- applicationInput.setValidityType(validityType);
- applicationInput.setDataStaged(dataStaged);
+ applicationInput.setInputKeyType(inputType);
if (value != null){
applicationInput.setValue(value.toCharArray());
}
@@ -203,14 +133,7 @@ public class ApplicationInputResource extends AbstractResource {
existingInput.setTask(taskDetail);
existingInput.setTaskId(taskDetail.getTaskId());
existingInput.setInputKey(inputKey);
- existingInput.setDataType(dataType);
- existingInput.setAppArgument(appArgument);
- existingInput.setStandardInput(standardInput);
- existingInput.setUserFriendlyDesc(userFriendlyDesc);
- existingInput.setInputOrder(inputOrder);
- existingInput.setCommandLineType(commandLineType);
- existingInput.setValidityType(validityType);
- existingInput.setDataStaged(dataStaged);
+ existingInput.setInputKeyType(inputType);
if (value != null){
existingInput.setValue(value.toCharArray());
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
index 4209f87..544d6ab 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationOutputResource.java
@@ -39,35 +39,9 @@ public class ApplicationOutputResource extends AbstractResource {
private static final Logger logger = LoggerFactory.getLogger(ApplicationOutputResource.class);
private TaskDetailResource taskDetailResource;
private String outputKey;
- private String dataType;
+ private String outputType;
+ private String metadata;
private String value;
- private String validityType;
- private boolean dataMovement;
- private String dataNameLocation;
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
public String getOutputKey() {
return outputKey;
@@ -77,12 +51,20 @@ public class ApplicationOutputResource extends AbstractResource {
this.outputKey = outputKey;
}
- public String getDataType() {
- return dataType;
+ public String getOutputType() {
+ return outputType;
+ }
+
+ public void setOutputType(String outputType) {
+ this.outputType = outputType;
+ }
+
+ public String getMetadata() {
+ return metadata;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setMetadata(String metadata) {
+ this.metadata = metadata;
}
public String getValue() {
@@ -140,25 +122,21 @@ public class ApplicationOutputResource extends AbstractResource {
applicationOutput.setTask(taskDetail);
applicationOutput.setTaskId(taskDetail.getTaskId());
applicationOutput.setOutputKey(outputKey);
- applicationOutput.setDataType(dataType);
- applicationOutput.setValidityType(validityType);
- applicationOutput.setDataMovement(dataMovement);
- applicationOutput.setDataNameLocation(dataNameLocation);
+ applicationOutput.setOutputKeyType(outputType);
if (value != null){
applicationOutput.setValue(value.toCharArray());
}
+ applicationOutput.setMetadata(metadata);
if (existingOutput != null) {
existingOutput.setTask(taskDetail);
existingOutput.setTaskId(taskDetail.getTaskId());
existingOutput.setOutputKey(outputKey);
- existingOutput.setDataType(dataType);
- existingOutput.setValidityType(validityType);
- existingOutput.setDataMovement(dataMovement);
- existingOutput.setDataNameLocation(dataNameLocation);
+ existingOutput.setOutputKeyType(outputType);
if (value != null){
existingOutput.setValue(value.toCharArray());
}
+ existingOutput.setMetadata(metadata);
applicationOutput = em.merge(existingOutput);
} else {
em.persist(applicationOutput);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
index eaf401d..26f7ce5 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java
@@ -40,71 +40,8 @@ public class ExperimentInputResource extends AbstractResource {
private ExperimentResource experimentResource;
private String experimentKey;
private String value;
+ private String inputType;
private String metadata;
- private String dataType;
- private String appArgument;
- private boolean standardInput;
- private String userFriendlyDesc;
- private int inputOrder;
- private String validityType;
- private String commandLineType;
- private boolean dataStaged;
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
-
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
- public String getAppArgument() {
- return appArgument;
- }
-
- public void setAppArgument(String appArgument) {
- this.appArgument = appArgument;
- }
-
- public boolean isStandardInput() {
- return standardInput;
- }
-
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public String getUserFriendlyDesc() {
- return userFriendlyDesc;
- }
-
- public void setUserFriendlyDesc(String userFriendlyDesc) {
- this.userFriendlyDesc = userFriendlyDesc;
- }
public String getExperimentKey() {
return experimentKey;
@@ -130,12 +67,12 @@ public class ExperimentInputResource extends AbstractResource {
this.experimentResource = experimentResource;
}
- public String getDataType() {
- return dataType;
+ public String getInputType() {
+ return inputType;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setInputType(String inputType) {
+ this.inputType = inputType;
}
public String getMetadata() {
@@ -183,15 +120,9 @@ public class ExperimentInputResource extends AbstractResource {
if (value != null){
exInput.setValue(value.toCharArray());
}
- exInput.setDataType(dataType);
+ exInput.setInputType(inputType);
exInput.setMetadata(metadata);
- exInput.setAppArgument(appArgument);
- exInput.setStandardInput(standardInput);
- exInput.setUserFriendlyDesc(userFriendlyDesc);
- exInput.setInputOrder(inputOrder);
- exInput.setCommandLineType(commandLineType);
- exInput.setValidityType(validityType);
- exInput.setDataStaged(dataStaged);
+
if (existingInput != null) {
existingInput.setEx_key(experimentKey);
existingInput.setExperiment(experiment);
@@ -199,15 +130,8 @@ public class ExperimentInputResource extends AbstractResource {
if (value != null){
existingInput.setValue(value.toCharArray());
}
- existingInput.setDataType(dataType);
+ existingInput.setInputType(inputType);
existingInput.setMetadata(metadata);
- existingInput.setAppArgument(appArgument);
- existingInput.setStandardInput(standardInput);
- existingInput.setUserFriendlyDesc(userFriendlyDesc);
- existingInput.setInputOrder(inputOrder);
- existingInput.setCommandLineType(commandLineType);
- existingInput.setValidityType(validityType);
- existingInput.setDataStaged(dataStaged);
exInput = em.merge(existingInput);
} else {
em.persist(exInput);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
index 983ff8b..5b2f0bb 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java
@@ -40,34 +40,8 @@ public class ExperimentOutputResource extends AbstractResource {
private ExperimentResource experimentResource;
private String experimentKey;
private String value;
- private String dataType;
- private String validityType;
- private boolean dataMovement;
- private String dataNameLocation;
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
+ private String outputType;
+ private String metadata;
public String getExperimentKey() {
return experimentKey;
@@ -93,12 +67,20 @@ public class ExperimentOutputResource extends AbstractResource {
this.experimentResource = experimentResource;
}
- public String getDataType() {
- return dataType;
+ public String getOutputType() {
+ return outputType;
+ }
+
+ public void setOutputType(String outputType) {
+ this.outputType = outputType;
+ }
+
+ public String getMetadata() {
+ return metadata;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setMetadata(String metadata) {
+ this.metadata = metadata;
}
public Resource create(ResourceType type) throws RegistryException {
@@ -138,10 +120,8 @@ public class ExperimentOutputResource extends AbstractResource {
if (value != null){
exOutput.setValue(value.toCharArray());
}
- exOutput.setDataType(dataType);
- exOutput.setValidityType(validityType);
- exOutput.setDataMovement(dataMovement);
- exOutput.setDataNameLocation(dataNameLocation);
+ exOutput.setOutputKeyType(outputType);
+ exOutput.setMetadata(metadata);
if (existingOutput != null) {
existingOutput.setEx_key(experimentKey);
@@ -150,10 +130,8 @@ public class ExperimentOutputResource extends AbstractResource {
existingOutput.setValue(value.toCharArray());
}
existingOutput.setExperiment_id(experiment.getExpId());
- existingOutput.setDataType(dataType);
- existingOutput.setValidityType(validityType);
- existingOutput.setDataMovement(dataMovement);
- existingOutput.setDataNameLocation(dataNameLocation);
+ existingOutput.setOutputKeyType(outputType);
+ existingOutput.setMetadata(metadata);
exOutput = em.merge(existingOutput);
} else {
em.persist(exOutput);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
index 75fe601..138dd6c 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeInputResource.java
@@ -40,64 +40,9 @@ public class NodeInputResource extends AbstractResource {
private WorkflowNodeDetailResource nodeDetailResource;
private String inputKey;
- private String dataType;
+ private String inputType;
private String metadata;
private String value;
- private String appArgument;
- private boolean standardInput;
- private String userFriendlyDesc;
- private int inputOrder;
- private String validityType;
- private String commandLineType;
- private boolean dataStaged;
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public String getCommandLineType() {
- return commandLineType;
- }
-
- public void setCommandLineType(String commandLineType) {
- this.commandLineType = commandLineType;
- }
-
- public boolean isDataStaged() {
- return dataStaged;
- }
-
- public void setDataStaged(boolean dataStaged) {
- this.dataStaged = dataStaged;
- }
-
- public String getAppArgument() {
- return appArgument;
- }
-
- public void setAppArgument(String appArgument) {
- this.appArgument = appArgument;
- }
-
- public boolean isStandardInput() {
- return standardInput;
- }
-
- public void setStandardInput(boolean standardInput) {
- this.standardInput = standardInput;
- }
-
- public String getUserFriendlyDesc() {
- return userFriendlyDesc;
- }
-
- public void setUserFriendlyDesc(String userFriendlyDesc) {
- this.userFriendlyDesc = userFriendlyDesc;
- }
public WorkflowNodeDetailResource getNodeDetailResource() {
return nodeDetailResource;
@@ -115,12 +60,12 @@ public class NodeInputResource extends AbstractResource {
this.inputKey = inputKey;
}
- public String getDataType() {
- return dataType;
+ public String getInputType() {
+ return inputType;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setInputType(String inputType) {
+ this.inputType = inputType;
}
public String getMetadata() {
@@ -139,14 +84,7 @@ public class NodeInputResource extends AbstractResource {
this.value = value;
}
- public int getInputOrder() {
- return inputOrder;
- }
-
- public void setInputOrder(int inputOrder) {
- this.inputOrder = inputOrder;
- }
-
+
public Resource create(ResourceType type) throws RegistryException {
logger.error("Unsupported resource type for node input data resource.", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -185,31 +123,17 @@ public class NodeInputResource extends AbstractResource {
nodeInput.setNodeDetails(nodeDetail);
nodeInput.setNodeId(nodeDetail.getNodeId());
nodeInput.setInputKey(inputKey);
- nodeInput.setDataType(dataType);
+ nodeInput.setInputKeyType(inputType);
nodeInput.setValue(value);
nodeInput.setMetadata(metadata);
- nodeInput.setAppArgument(appArgument);
- nodeInput.setStandardInput(standardInput);
- nodeInput.setUserFriendlyDesc(userFriendlyDesc);
- nodeInput.setInputOrder(inputOrder);
- nodeInput.setCommandLineType(commandLineType);
- nodeInput.setValidityType(validityType);
- nodeInput.setDataStaged(dataStaged);
if (existingInput != null){
existingInput.setNodeDetails(nodeDetail);
existingInput.setNodeId(nodeDetail.getNodeId());
existingInput.setInputKey(inputKey);
- existingInput.setDataType(dataType);
+ existingInput.setInputKeyType(inputType);
existingInput.setValue(value);
existingInput.setMetadata(metadata);
- existingInput.setAppArgument(appArgument);
- existingInput.setStandardInput(standardInput);
- existingInput.setUserFriendlyDesc(userFriendlyDesc);
- existingInput.setInputOrder(inputOrder);
- existingInput.setCommandLineType(commandLineType);
- existingInput.setValidityType(validityType);
- existingInput.setDataStaged(dataStaged);
nodeInput = em.merge(existingInput);
}else {
em.persist(nodeInput);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
index caeae7e..164a2e0 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeOutputResource.java
@@ -40,35 +40,9 @@ public class NodeOutputResource extends AbstractResource {
private WorkflowNodeDetailResource nodeDetailResource;
private String outputKey;
- private String dataType;
+ private String outputType;
+ private String metadata;
private String value;
- private String validityType;
- private boolean dataMovement;
- private String dataNameLocation;
-
- public String getValidityType() {
- return validityType;
- }
-
- public void setValidityType(String validityType) {
- this.validityType = validityType;
- }
-
- public boolean isDataMovement() {
- return dataMovement;
- }
-
- public void setDataMovement(boolean dataMovement) {
- this.dataMovement = dataMovement;
- }
-
- public String getDataNameLocation() {
- return dataNameLocation;
- }
-
- public void setDataNameLocation(String dataNameLocation) {
- this.dataNameLocation = dataNameLocation;
- }
public WorkflowNodeDetailResource getNodeDetailResource() {
return nodeDetailResource;
@@ -86,12 +60,20 @@ public class NodeOutputResource extends AbstractResource {
this.outputKey = outputKey;
}
- public String getDataType() {
- return dataType;
+ public String getOutputType() {
+ return outputType;
+ }
+
+ public void setOutputType(String outputType) {
+ this.outputType = outputType;
+ }
+
+ public String getMetadata() {
+ return metadata;
}
- public void setDataType(String dataType) {
- this.dataType = dataType;
+ public void setMetadata(String metadata) {
+ this.metadata = metadata;
}
public String getValue() {
@@ -141,21 +123,17 @@ public class NodeOutputResource extends AbstractResource {
nodeOutput.setNode(nodeDetail);
nodeOutput.setNodeId(nodeDetail.getNodeId());
nodeOutput.setOutputKey(outputKey);
- nodeOutput.setDataType(dataType);
+ nodeOutput.setOutputKeyType(outputType);
nodeOutput.setValue(value);
- nodeOutput.setValidityType(validityType);
- nodeOutput.setDataMovement(dataMovement);
- nodeOutput.setDataNameLocation(dataNameLocation);
+ nodeOutput.setMetadata(metadata);
if (existingOutput != null) {
existingOutput.setNode(nodeDetail);
existingOutput.setNodeId(nodeDetail.getNodeId());
existingOutput.setOutputKey(outputKey);
- existingOutput.setDataType(dataType);
+ existingOutput.setOutputKeyType(outputType);
existingOutput.setValue(value);
- existingOutput.setValidityType(validityType);
- existingOutput.setDataMovement(dataMovement);
- existingOutput.setDataNameLocation(dataNameLocation);
+ existingOutput.setMetadata(metadata);
nodeOutput = em.merge(existingOutput);
} else {
em.persist(nodeOutput);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index e131a47..3218ecd 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -513,17 +513,9 @@ public class Utils {
if (o != null){
ExperimentResource experimentResource = (ExperimentResource)createExperiment(o.getExperiment());
eInputResource.setExperimentResource(experimentResource);
- eInputResource.setDataType(o.getDataType());
+ eInputResource.setInputType(o.getInputType());
eInputResource.setMetadata(o.getMetadata());
eInputResource.setExperimentKey(o.getEx_key());
- eInputResource.setAppArgument(o.getAppArgument());
- eInputResource.setInputOrder(o.getInputOrder());
- eInputResource.setStandardInput(o.isStandardInput());
- eInputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
- eInputResource.setValidityType(o.getValidityType());
- eInputResource.setCommandLineType(o.getCommandLineType());
- eInputResource.setDataStaged(o.isDataStaged());
-
if (o.getValue() != null){
eInputResource.setValue(new String(o.getValue()));
}
@@ -541,10 +533,8 @@ public class Utils {
if (o.getValue() != null){
eOutputResource.setValue(new String(o.getValue()));
}
- eOutputResource.setDataType(o.getDataType());
- eOutputResource.setValidityType(o.getValidityType());
- eOutputResource.setDataMovement(o.isDataMovement());
- eOutputResource.setDataNameLocation(o.getDataNameLocation());
+ eOutputResource.setOutputType(o.getOutputKeyType());
+ eOutputResource.setMetadata(o.getMetadata());
}
return eOutputResource;
}
@@ -611,14 +601,7 @@ public class Utils {
TaskDetailResource taskDetailResource = (TaskDetailResource)createTaskDetail(o.getTask());
inputResource.setTaskDetailResource(taskDetailResource);
inputResource.setInputKey(o.getInputKey());
- inputResource.setDataType(o.getDataType());
- inputResource.setAppArgument(o.getAppArgument());
- inputResource.setInputOrder(o.getInputOrder());
- inputResource.setStandardInput(o.isStandardInput());
- inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
- inputResource.setValidityType(o.getValidityType());
- inputResource.setCommandLineType(o.getCommandLineType());
- inputResource.setDataStaged(o.isDataStaged());
+ inputResource.setInputType(o.getInputKeyType());
if (o.getValue() != null){
inputResource.setValue(new String(o.getValue()));
}
@@ -632,14 +615,12 @@ public class Utils {
if (o != null){
TaskDetailResource taskDetailResource = (TaskDetailResource)createTaskDetail(o.getTask());
outputResource.setTaskDetailResource(taskDetailResource);
- outputResource.setDataType(o.getDataType());
+ outputResource.setOutputType(o.getOutputKeyType());
outputResource.setOutputKey(o.getOutputKey());
if (o.getValue() != null){
outputResource.setValue(new String(o.getValue()));
}
- outputResource.setValidityType(o.getValidityType());
- outputResource.setDataMovement(o.isDataMovement());
- outputResource.setDataNameLocation(o.getDataNameLocation());
+ outputResource.setMetadata(o.getMetadata());
}
return outputResource;
}
@@ -650,16 +631,9 @@ public class Utils {
WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)createWorkflowNodeDetail(o.getNodeDetails());
inputResource.setNodeDetailResource(nodeDetailResource);
inputResource.setInputKey(o.getInputKey());
- inputResource.setDataType(o.getDataType());
+ inputResource.setInputType(o.getInputKeyType());
inputResource.setValue(o.getValue());
inputResource.setMetadata(o.getMetadata());
- inputResource.setAppArgument(o.getAppArgument());
- inputResource.setInputOrder(o.getInputOrder());
- inputResource.setStandardInput(o.isStandardInput());
- inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc());
- inputResource.setValidityType(o.getValidityType());
- inputResource.setCommandLineType(o.getCommandLineType());
- inputResource.setDataStaged(o.isDataStaged());
}
return inputResource;
}
@@ -669,12 +643,10 @@ public class Utils {
if (o != null){
WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)createWorkflowNodeDetail(o.getNode());
outputResource.setNodeDetailResource(nodeDetailResource);
- outputResource.setDataType(o.getDataType());
+ outputResource.setOutputType(o.getOutputKeyType());
outputResource.setOutputKey(o.getOutputKey());
outputResource.setValue(o.getValue());
- outputResource.setValidityType(o.getValidityType());
- outputResource.setDataMovement(o.isDataMovement());
- outputResource.setDataNameLocation(o.getDataNameLocation());
+ outputResource.setMetadata(o.getMetadata());
}
return outputResource;
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index 9818e6f..306bd3f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -24,7 +24,9 @@ package org.apache.airavata.persistance.registry.jpa.utils;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.model.appcatalog.appinterface.*;
+import org.apache.airavata.model.appcatalog.appinterface.DataType;
+import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
+import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.model.workspace.experiment.ActionableGroup;
import org.apache.airavata.model.workspace.experiment.AdvancedInputDataHandling;
@@ -184,61 +186,28 @@ public class ThriftDataModelConversion {
ExperimentInputResource expInput = (ExperimentInputResource) object;
dataObjectType.setName(expInput.getExperimentKey());
dataObjectType.setValue(expInput.getValue());
- if (expInput.getDataType() != null){
- dataObjectType.setType(DataType.valueOf(expInput.getDataType()));
+ if (expInput.getInputType() != null){
+ dataObjectType.setType(DataType.valueOf(expInput.getInputType()));
}
dataObjectType.setMetaData(expInput.getMetadata());
- dataObjectType.setApplicationArgument(expInput.getAppArgument());
- dataObjectType.setStandardInput(expInput.isStandardInput());
- dataObjectType.setUserFriendlyDescription(expInput.getUserFriendlyDesc());
- dataObjectType.setInputOrder(expInput.getInputOrder());
- if (expInput.getValidityType() != null){
- dataObjectType.setInputValid(ValidityType.valueOf(expInput.getValidityType()));
- }
- if (expInput.getCommandLineType() != null){
- dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(expInput.getCommandLineType()));
- }
- dataObjectType.setDataStaged(expInput.isDataStaged());
return dataObjectType;
}else if (object instanceof NodeInputResource){
NodeInputResource nodeInputResource = (NodeInputResource)object;
dataObjectType.setName(nodeInputResource.getInputKey());
dataObjectType.setValue(nodeInputResource.getValue());
- if (nodeInputResource.getDataType() != null){
- dataObjectType.setType(DataType.valueOf(nodeInputResource.getDataType()));
+ if (nodeInputResource.getInputType() != null){
+ dataObjectType.setType(DataType.valueOf(nodeInputResource.getInputType()));
}
dataObjectType.setMetaData(nodeInputResource.getMetadata());
- dataObjectType.setApplicationArgument(nodeInputResource.getAppArgument());
- dataObjectType.setStandardInput(nodeInputResource.isStandardInput());
- dataObjectType.setUserFriendlyDescription(nodeInputResource.getUserFriendlyDesc());
- dataObjectType.setInputOrder(nodeInputResource.getInputOrder());
- if (nodeInputResource.getValidityType() != null){
- dataObjectType.setInputValid(ValidityType.valueOf(nodeInputResource.getValidityType()));
- }
- if (nodeInputResource.getCommandLineType() != null){
- dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(nodeInputResource.getCommandLineType()));
- }
- dataObjectType.setDataStaged(nodeInputResource.isDataStaged());
return dataObjectType;
}else if (object instanceof ApplicationInputResource){
ApplicationInputResource inputResource = (ApplicationInputResource)object;
dataObjectType.setName(inputResource.getInputKey());
dataObjectType.setValue(inputResource.getValue());
- if (inputResource.getDataType() != null){
- dataObjectType.setType(DataType.valueOf(inputResource.getDataType()));
+ if (inputResource.getInputType() != null){
+ dataObjectType.setType(DataType.valueOf(inputResource.getInputType()));
}
dataObjectType.setMetaData(inputResource.getMetadata());
- dataObjectType.setApplicationArgument(inputResource.getAppArgument());
- dataObjectType.setStandardInput(inputResource.isStandardInput());
- dataObjectType.setUserFriendlyDescription(inputResource.getUserFriendlyDesc());
- dataObjectType.setInputOrder(inputResource.getInputOrder());
- if (inputResource.getValidityType() != null){
- dataObjectType.setInputValid(ValidityType.valueOf(inputResource.getValidityType()));
- }
- if (inputResource.getCommandLineType() != null){
- dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(inputResource.getCommandLineType()));
- }
- dataObjectType.setDataStaged(inputResource.isDataStaged());
return dataObjectType;
}else {
return null;
@@ -254,40 +223,28 @@ public class ThriftDataModelConversion {
ExperimentOutputResource expOutput = (ExperimentOutputResource)object;
dataObjectType.setName(expOutput.getExperimentKey());
dataObjectType.setValue(expOutput.getValue());
- if (expOutput.getDataType() != null){
- dataObjectType.setType(DataType.valueOf(expOutput.getDataType()));
- }
- if (expOutput.getValidityType() != null){
- dataObjectType.setValidityType(ValidityType.valueOf(expOutput.getValidityType()));
+ if (expOutput.getOutputType() != null){
+ dataObjectType.setType(DataType.valueOf(expOutput.getOutputType()));
}
- dataObjectType.setDataMovement(expOutput.isDataMovement());
- dataObjectType.setDataNameLocation(expOutput.getDataNameLocation());
+// dataObjectType.setMetaData(expOutput.getMetadata());
return dataObjectType;
}else if (object instanceof NodeOutputResource){
NodeOutputResource nodeOutputResource = (NodeOutputResource)object;
dataObjectType.setName(nodeOutputResource.getOutputKey());
dataObjectType.setValue(nodeOutputResource.getValue());
- if (nodeOutputResource.getDataType() != null){
- dataObjectType.setType(DataType.valueOf(nodeOutputResource.getDataType()));
+ if (nodeOutputResource.getOutputType() != null){
+ dataObjectType.setType(DataType.valueOf(nodeOutputResource.getOutputType()));
}
- if (nodeOutputResource.getValidityType() != null){
- dataObjectType.setValidityType(ValidityType.valueOf(nodeOutputResource.getValidityType()));
- }
- dataObjectType.setDataMovement(nodeOutputResource.isDataMovement());
- dataObjectType.setDataNameLocation(nodeOutputResource.getDataNameLocation());
+// dataObjectType.setMetaData(nodeOutputResource.getMetadata());
return dataObjectType;
}else if (object instanceof ApplicationOutputResource){
ApplicationOutputResource outputResource = (ApplicationOutputResource)object;
dataObjectType.setName(outputResource.getOutputKey());
dataObjectType.setValue(outputResource.getValue());
- if (outputResource.getDataType() != null){
- dataObjectType.setType(DataType.valueOf(outputResource.getDataType()));
- }
- if (outputResource.getValidityType() != null){
- dataObjectType.setValidityType(ValidityType.valueOf(outputResource.getValidityType()));
+ if (outputResource.getOutputType() != null){
+ dataObjectType.setType(DataType.valueOf(outputResource.getOutputType()));
}
- dataObjectType.setDataMovement(outputResource.isDataMovement());
- dataObjectType.setDataNameLocation(outputResource.getDataNameLocation());
+// dataObjectType.setMetaData(outputResource.getMetadata());
return dataObjectType;
}else {
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
index c1bd458..9ed5ca9 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
@@ -125,16 +125,9 @@ CREATE TABLE EXPERIMENT_INPUT
(
EXPERIMENT_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ INPUT_TYPE VARCHAR(255),
METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
VALUE CLOB,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -143,11 +136,9 @@ CREATE TABLE EXPERIMENT_OUTPUT
(
EXPERIMENT_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE CLOB,
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -201,16 +192,9 @@ CREATE TABLE APPLICATION_INPUT
(
TASK_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ INPUT_KEY_TYPE VARCHAR(255),
METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
VALUE CLOB,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(TASK_ID,INPUT_KEY),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -219,11 +203,9 @@ CREATE TABLE APPLICATION_OUTPUT
(
TASK_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE CLOB,
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(TASK_ID,OUTPUT_KEY),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -232,16 +214,9 @@ CREATE TABLE NODE_INPUT
(
NODE_INSTANCE_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ INPUT_KEY_TYPE VARCHAR(255),
METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
VALUE VARCHAR(255),
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
);
@@ -250,11 +225,9 @@ CREATE TABLE NODE_OUTPUT
(
NODE_INSTANCE_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE VARCHAR(255),
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
index 7f7dfab..286a8fb 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
@@ -125,16 +125,9 @@ CREATE TABLE EXPERIMENT_INPUT
(
EXPERIMENT_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
+ INPUT_TYPE VARCHAR(255),
METADATA VARCHAR(255),
VALUE LONGTEXT,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -143,11 +136,9 @@ CREATE TABLE EXPERIMENT_OUTPUT
(
EXPERIMENT_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE LONGTEXT,
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -182,16 +173,9 @@ CREATE TABLE APPLICATION_INPUT
(
TASK_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
+ INPUT_KEY_TYPE VARCHAR(255),
METADATA VARCHAR(255),
VALUE LONGTEXT,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(TASK_ID,INPUT_KEY),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -200,11 +184,9 @@ CREATE TABLE APPLICATION_OUTPUT
(
TASK_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE LONGTEXT,
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(TASK_ID,OUTPUT_KEY),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -213,16 +195,9 @@ CREATE TABLE NODE_INPUT
(
NODE_INSTANCE_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
+ INPUT_KEY_TYPE VARCHAR(255),
METADATA VARCHAR(255),
VALUE VARCHAR(255),
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
);
@@ -231,11 +206,9 @@ CREATE TABLE NODE_OUTPUT
(
NODE_INSTANCE_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE VARCHAR(255),
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
index a46e196..318b044 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentInputResourceTest.java
@@ -53,7 +53,7 @@ public class ExperimentInputResourceTest extends AbstractResourceTest {
experimentInputResource.setExperimentResource(experimentResource);
experimentInputResource.setExperimentKey("testKey");
experimentInputResource.setValue("testValue");
- experimentInputResource.setDataType("string");
+ experimentInputResource.setInputType("string");
experimentInputResource.save();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
index 696db36..ad8ae7f 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentOutputResourceTest.java
@@ -54,7 +54,7 @@ public class ExperimentOutputResourceTest extends AbstractResourceTest {
outputResource.setExperimentResource(experimentResource);
outputResource.setExperimentKey("testKey");
outputResource.setValue("testValue");
- outputResource.setDataType("string");
+ outputResource.setOutputType("string");
outputResource.save();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
index c1bd458..9ed5ca9 100644
--- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
@@ -125,16 +125,9 @@ CREATE TABLE EXPERIMENT_INPUT
(
EXPERIMENT_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ INPUT_TYPE VARCHAR(255),
METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
VALUE CLOB,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -143,11 +136,9 @@ CREATE TABLE EXPERIMENT_OUTPUT
(
EXPERIMENT_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE CLOB,
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -201,16 +192,9 @@ CREATE TABLE APPLICATION_INPUT
(
TASK_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ INPUT_KEY_TYPE VARCHAR(255),
METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
VALUE CLOB,
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(TASK_ID,INPUT_KEY),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -219,11 +203,9 @@ CREATE TABLE APPLICATION_OUTPUT
(
TASK_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE CLOB,
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(TASK_ID,OUTPUT_KEY),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -232,16 +214,9 @@ CREATE TABLE NODE_INPUT
(
NODE_INSTANCE_ID VARCHAR(255),
INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ INPUT_KEY_TYPE VARCHAR(255),
METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
VALUE VARCHAR(255),
- INPUT_ORDER INTEGER,
- VALIDITY_TYPE VARCHAR(255),
- COMMANDLINE_TYPE VARCHAR(255),
- DATA_STAGED SMALLINT,
PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
);
@@ -250,11 +225,9 @@ CREATE TABLE NODE_OUTPUT
(
NODE_INSTANCE_ID VARCHAR(255),
OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
+ OUTPUT_KEY_TYPE VARCHAR(255),
+ METADATA VARCHAR(255),
VALUE VARCHAR(255),
- VALIDITY_TYPE VARCHAR(255),
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a1b225f/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
index 1f23601..fa4fd32 100644
--- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
+++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreter.java
@@ -1050,7 +1050,7 @@ public class WorkflowInterpreter implements AbstractActivityListener{
Node fromNode = dataPort.getFromNode();
String portInputValue = null;
if (fromNode instanceof InputNode){
- portInputValue = (String) ((InputNode) fromNode).getDefaultValue();
+ portInputValue = (String) ((InputNode) fromNode).getDefaultValue();
} else if (fromNode instanceof WSNode){
Map<String, String> outputData = nodeOutputData.get(fromNode);
portInputValue = outputData.get(dataPort.getName());
@@ -1058,17 +1058,9 @@ public class WorkflowInterpreter implements AbstractActivityListener{
portInputValue = outputData.get(dataPort.getEdge(0).getFromPort().getName());
}
}
- // 123456789
- InputDataObjectType elem = new InputDataObjectType();
- elem.setName(dataPort.getName());
+ InputDataObjectType elem = new InputDataObjectType();
+ elem.setName(dataPort.getName());
elem.setValue(portInputValue);
- if (dataPort instanceof WSPort) {
- WSPort port = (WSPort) dataPort;
- elem.setInputOrder(port.getComponentPort().getInputOrder());
- elem.setApplicationArgument(
- (port.getComponentPort().getApplicationArgument() != null ? port.getComponentPort().getApplicationArgument() : ""));
- }
-
nodeDetails.addToNodeInputs(elem);
}
try {