Repository: airavata Updated Branches: refs/heads/master 97ad96b27 -> f8b6adb7b
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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 92cd02c..eca13a6 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 @@ -41,25 +41,25 @@ public class ExperimentOutputResource extends AbstractResource { private String experimentKey; private String value; private String dataType; - private String validityType; + private boolean isRequired; private boolean dataMovement; private String dataNameLocation; - private String commandLineType; + private boolean requiredToCMD; - public String getCommandLineType() { - return commandLineType; + public boolean getRequiredToCMD() { + return requiredToCMD; } - public void setCommandLineType(String commandLineType) { - this.commandLineType = commandLineType; + public void setRequiredToCMD(boolean requiredToCMD) { + this.requiredToCMD = requiredToCMD; } - public String getValidityType() { - return validityType; + public boolean getRequired() { + return isRequired; } - public void setValidityType(String validityType) { - this.validityType = validityType; + public void setRequired(boolean required) { + this.isRequired = required; } public boolean isDataMovement() { @@ -148,8 +148,8 @@ public class ExperimentOutputResource extends AbstractResource { exOutput.setValue(value.toCharArray()); } exOutput.setDataType(dataType); - exOutput.setValidityType(validityType); - exOutput.setCommandLineType(commandLineType); + exOutput.setRequired(isRequired); + exOutput.setRequiredToCMD(requiredToCMD); exOutput.setDataMovement(dataMovement); exOutput.setDataNameLocation(dataNameLocation); @@ -161,8 +161,8 @@ public class ExperimentOutputResource extends AbstractResource { } existingOutput.setExperiment_id(experiment.getExpId()); existingOutput.setDataType(dataType); - existingOutput.setValidityType(validityType); - existingOutput.setCommandLineType(commandLineType); + existingOutput.setRequired(isRequired); + existingOutput.setRequiredToCMD(requiredToCMD); existingOutput.setDataMovement(dataMovement); existingOutput.setDataNameLocation(dataNameLocation); exOutput = em.merge(existingOutput); http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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..4efb8a4 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 @@ -47,24 +47,24 @@ public class NodeInputResource extends AbstractResource { private boolean standardInput; private String userFriendlyDesc; private int inputOrder; - private String validityType; - private String commandLineType; + private boolean isRequired; + private boolean requiredToCMD; private boolean dataStaged; - public String getValidityType() { - return validityType; + public boolean getRequired() { + return isRequired; } - public void setValidityType(String validityType) { - this.validityType = validityType; + public void setRequired(boolean required) { + this.isRequired = required; } - public String getCommandLineType() { - return commandLineType; + public boolean getRequiredToCMD() { + return requiredToCMD; } - public void setCommandLineType(String commandLineType) { - this.commandLineType = commandLineType; + public void setRequiredToCMD(boolean requiredToCMD) { + this.requiredToCMD = requiredToCMD; } public boolean isDataStaged() { @@ -192,8 +192,8 @@ public class NodeInputResource extends AbstractResource { nodeInput.setStandardInput(standardInput); nodeInput.setUserFriendlyDesc(userFriendlyDesc); nodeInput.setInputOrder(inputOrder); - nodeInput.setCommandLineType(commandLineType); - nodeInput.setValidityType(validityType); + nodeInput.setRequiredToCMD(requiredToCMD); + nodeInput.setIsRequired(isRequired); nodeInput.setDataStaged(dataStaged); if (existingInput != null){ @@ -207,8 +207,8 @@ public class NodeInputResource extends AbstractResource { existingInput.setStandardInput(standardInput); existingInput.setUserFriendlyDesc(userFriendlyDesc); existingInput.setInputOrder(inputOrder); - existingInput.setCommandLineType(commandLineType); - existingInput.setValidityType(validityType); + existingInput.setRequiredToCMD(requiredToCMD); + existingInput.setIsRequired(isRequired); existingInput.setDataStaged(dataStaged); nodeInput = em.merge(existingInput); }else { http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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 acdf1dc..cbe0dab 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 @@ -42,25 +42,25 @@ public class NodeOutputResource extends AbstractResource { private String outputKey; private String dataType; private String value; - private String validityType; + private boolean isRequired; private boolean dataMovement; private String dataNameLocation; - private String commandLineType; + private boolean requiredToCMD; - public String getCommandLineType() { - return commandLineType; + public boolean getRequiredToCMD() { + return requiredToCMD; } - public void setCommandLineType(String commandLineType) { - this.commandLineType = commandLineType; + public void setRequiredToCMD(boolean requiredToCMD) { + this.requiredToCMD = requiredToCMD; } - public String getValidityType() { - return validityType; + public boolean getRequired() { + return isRequired; } - public void setValidityType(String validityType) { - this.validityType = validityType; + public void setRequired(boolean required) { + this.isRequired = required; } public boolean isDataMovement() { @@ -152,8 +152,8 @@ public class NodeOutputResource extends AbstractResource { nodeOutput.setOutputKey(outputKey); nodeOutput.setDataType(dataType); nodeOutput.setValue(value); - nodeOutput.setValidityType(validityType); - nodeOutput.setCommandLineType(commandLineType); + nodeOutput.setRequired(isRequired); + nodeOutput.setRequiredToCMD(requiredToCMD); nodeOutput.setDataMovement(dataMovement); nodeOutput.setDataNameLocation(dataNameLocation); @@ -163,8 +163,8 @@ public class NodeOutputResource extends AbstractResource { existingOutput.setOutputKey(outputKey); existingOutput.setDataType(dataType); existingOutput.setValue(value); - existingOutput.setValidityType(validityType); - existingOutput.setCommandLineType(commandLineType); + existingOutput.setRequired(isRequired); + existingOutput.setRequiredToCMD(requiredToCMD); existingOutput.setDataMovement(dataMovement); existingOutput.setDataNameLocation(dataNameLocation); nodeOutput = em.merge(existingOutput); http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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 b61a19a..9935e55 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 @@ -520,8 +520,8 @@ public class Utils { eInputResource.setInputOrder(o.getInputOrder()); eInputResource.setStandardInput(o.isStandardInput()); eInputResource.setUserFriendlyDesc(o.getUserFriendlyDesc()); - eInputResource.setValidityType(o.getValidityType()); - eInputResource.setCommandLineType(o.getCommandLineType()); + eInputResource.setRequired(o.isRequired()); + eInputResource.setRequiredToCMD(o.isRequiredToCMD()); eInputResource.setDataStaged(o.isDataStaged()); if (o.getValue() != null){ @@ -542,8 +542,8 @@ public class Utils { eOutputResource.setValue(new String(o.getValue())); } eOutputResource.setDataType(o.getDataType()); - eOutputResource.setValidityType(o.getValidityType()); - eOutputResource.setCommandLineType(o.getCommandLineType()); + eOutputResource.setRequired(o.isRequired()); + eOutputResource.setRequiredToCMD(o.isRequiredToCMD()); eOutputResource.setDataMovement(o.isDataMovement()); eOutputResource.setDataNameLocation(o.getDataNameLocation()); } @@ -617,8 +617,8 @@ public class Utils { inputResource.setInputOrder(o.getInputOrder()); inputResource.setStandardInput(o.isStandardInput()); inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc()); - inputResource.setValidityType(o.getValidityType()); - inputResource.setCommandLineType(o.getCommandLineType()); + inputResource.setRequired(o.isRequired()); + inputResource.setRequiredToCMD(o.isRequiredToCMD()); inputResource.setDataStaged(o.isDataStaged()); if (o.getValue() != null){ inputResource.setValue(new String(o.getValue())); @@ -638,8 +638,8 @@ public class Utils { if (o.getValue() != null){ outputResource.setValue(new String(o.getValue())); } - outputResource.setValidityType(o.getValidityType()); - outputResource.setCommandLineType(o.getCommandLineType()); + outputResource.setRequired(o.isRequired()); + outputResource.setRequiredToCMD(o.isAddedToCmd()); outputResource.setDataMovement(o.isDataMovement()); outputResource.setDataNameLocation(o.getDataNameLocation()); } @@ -659,8 +659,8 @@ public class Utils { inputResource.setInputOrder(o.getInputOrder()); inputResource.setStandardInput(o.isStandardInput()); inputResource.setUserFriendlyDesc(o.getUserFriendlyDesc()); - inputResource.setValidityType(o.getValidityType()); - inputResource.setCommandLineType(o.getCommandLineType()); + inputResource.setRequired(o.getIsRequired()); + inputResource.setRequiredToCMD(o.getRequiredToCMD()); inputResource.setDataStaged(o.isDataStaged()); } return inputResource; @@ -674,8 +674,8 @@ public class Utils { outputResource.setDataType(o.getDataType()); outputResource.setOutputKey(o.getOutputKey()); outputResource.setValue(o.getValue()); - outputResource.setValidityType(o.getValidityType()); - outputResource.setCommandLineType(o.getCommandLineType()); + outputResource.setRequired(o.isRequired()); + outputResource.setRequiredToCMD(o.isRequiredToCMD()); outputResource.setDataMovement(o.isDataMovement()); outputResource.setDataNameLocation(o.getDataNameLocation()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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 0f87863..4e63656 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 @@ -192,12 +192,8 @@ public class ThriftDataModelConversion { 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.setIsRequired(expInput.getRequired()); + dataObjectType.setRequiredToAddedToCommandLine(expInput.getRequiredToCMD()); dataObjectType.setDataStaged(expInput.isDataStaged()); return dataObjectType; }else if (object instanceof NodeInputResource){ @@ -212,12 +208,8 @@ public class ThriftDataModelConversion { 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.setIsRequired(nodeInputResource.getRequired()); + dataObjectType.setRequiredToAddedToCommandLine(nodeInputResource.getRequiredToCMD()); dataObjectType.setDataStaged(nodeInputResource.isDataStaged()); return dataObjectType; }else if (object instanceof ApplicationInputResource){ @@ -232,12 +224,8 @@ public class ThriftDataModelConversion { 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.setIsRequired(inputResource.isRequired()); + dataObjectType.setRequiredToAddedToCommandLine(inputResource.isRequiredToCMD()); dataObjectType.setDataStaged(inputResource.isDataStaged()); return dataObjectType; }else { @@ -257,12 +245,8 @@ public class ThriftDataModelConversion { if (expOutput.getDataType() != null){ dataObjectType.setType(DataType.valueOf(expOutput.getDataType())); } - if (expOutput.getValidityType() != null){ - dataObjectType.setValidityType(ValidityType.valueOf(expOutput.getValidityType())); - } - if (expOutput.getCommandLineType() != null){ - dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(expOutput.getCommandLineType())); - } + dataObjectType.setIsRequired(expOutput.getRequired()); + dataObjectType.setRequiredToAddedToCommandLine(expOutput.getRequiredToCMD()); dataObjectType.setDataMovement(expOutput.isDataMovement()); dataObjectType.setDataNameLocation(expOutput.getDataNameLocation()); return dataObjectType; @@ -273,12 +257,8 @@ public class ThriftDataModelConversion { if (nodeOutputResource.getDataType() != null){ dataObjectType.setType(DataType.valueOf(nodeOutputResource.getDataType())); } - if (nodeOutputResource.getValidityType() != null){ - dataObjectType.setValidityType(ValidityType.valueOf(nodeOutputResource.getValidityType())); - } - if (nodeOutputResource.getCommandLineType() != null){ - dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(nodeOutputResource.getCommandLineType())); - } + dataObjectType.setIsRequired(nodeOutputResource.getRequired()); + dataObjectType.setRequiredToAddedToCommandLine(nodeOutputResource.getRequiredToCMD()); dataObjectType.setDataMovement(nodeOutputResource.isDataMovement()); dataObjectType.setDataNameLocation(nodeOutputResource.getDataNameLocation()); return dataObjectType; @@ -286,15 +266,11 @@ public class ThriftDataModelConversion { ApplicationOutputResource outputResource = (ApplicationOutputResource)object; dataObjectType.setName(outputResource.getOutputKey()); dataObjectType.setValue(outputResource.getValue()); + dataObjectType.setIsRequired(outputResource.isRequired()); + dataObjectType.setRequiredToAddedToCommandLine(outputResource.isRequiredToCMD()); if (outputResource.getDataType() != null){ dataObjectType.setType(DataType.valueOf(outputResource.getDataType())); } - if (outputResource.getValidityType() != null){ - dataObjectType.setValidityType(ValidityType.valueOf(outputResource.getValidityType())); - } - if (outputResource.getCommandLineType() != null){ - dataObjectType.setAddedToCommandLine(CommandLineType.valueOf(outputResource.getCommandLineType())); - } dataObjectType.setDataMovement(outputResource.isDataMovement()); dataObjectType.setDataNameLocation(outputResource.getDataNameLocation()); return dataObjectType; http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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 ca78551..8f31a3f 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 @@ -132,8 +132,8 @@ CREATE TABLE EXPERIMENT_INPUT USER_FRIENDLY_DESC VARCHAR(255), VALUE CLOB, INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_STAGED SMALLINT, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE @@ -145,8 +145,8 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE CLOB, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), @@ -209,8 +209,8 @@ CREATE TABLE APPLICATION_INPUT USER_FRIENDLY_DESC VARCHAR(255), VALUE CLOB, INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_STAGED SMALLINT, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE @@ -222,8 +222,8 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE CLOB, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(TASK_ID,OUTPUT_KEY), @@ -241,8 +241,8 @@ CREATE TABLE NODE_INPUT USER_FRIENDLY_DESC VARCHAR(255), VALUE VARCHAR(255), INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, 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 @@ -254,8 +254,8 @@ CREATE TABLE NODE_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE VARCHAR(255), - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), @@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB NOT NULL, + TRANSFER_DESC VARCHAR(255) NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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 ccc82ff..374db98 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 @@ -132,8 +132,8 @@ CREATE TABLE EXPERIMENT_INPUT METADATA VARCHAR(255), VALUE LONGTEXT, INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_STAGED SMALLINT, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE @@ -145,8 +145,8 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE LONGTEXT, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), @@ -190,8 +190,8 @@ CREATE TABLE APPLICATION_INPUT METADATA VARCHAR(255), VALUE LONGTEXT, INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_STAGED SMALLINT, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE @@ -203,9 +203,9 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE LONGTEXT, - VALIDITY_TYPE VARCHAR(255), DATA_MOVEMENT SMALLINT, - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE @@ -222,8 +222,8 @@ CREATE TABLE NODE_INPUT METADATA VARCHAR(255), VALUE VARCHAR(255), INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, 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 @@ -235,8 +235,8 @@ CREATE TABLE NODE_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE VARCHAR(255), - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), @@ -259,7 +259,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), - TRANSFER_DESC LONGTEXT NOT NULL, + TRANSFER_DESC VARCHAR(255) NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/f8b6adb7/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..8f31a3f 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 @@ -132,8 +132,8 @@ CREATE TABLE EXPERIMENT_INPUT USER_FRIENDLY_DESC VARCHAR(255), VALUE CLOB, INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_STAGED SMALLINT, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE @@ -145,7 +145,8 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE CLOB, - VALIDITY_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), @@ -208,8 +209,8 @@ CREATE TABLE APPLICATION_INPUT USER_FRIENDLY_DESC VARCHAR(255), VALUE CLOB, INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_STAGED SMALLINT, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE @@ -221,7 +222,8 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE CLOB, - VALIDITY_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(TASK_ID,OUTPUT_KEY), @@ -239,8 +241,8 @@ CREATE TABLE NODE_INPUT USER_FRIENDLY_DESC VARCHAR(255), VALUE VARCHAR(255), INPUT_ORDER INTEGER, - VALIDITY_TYPE VARCHAR(255), - COMMANDLINE_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, 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 @@ -252,7 +254,8 @@ CREATE TABLE NODE_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, DATA_TYPE VARCHAR(255), VALUE VARCHAR(255), - VALIDITY_TYPE VARCHAR(255), + IS_REQUIRED SMALLINT, + REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), @@ -275,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB NOT NULL, + TRANSFER_DESC VARCHAR(255) NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE );
