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 {
