Repository: airavata Updated Branches: refs/heads/master f8b6adb7b -> dc22b7beb
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc22b7be/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 cbe0dab..ceb323b 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 @@ -46,6 +46,25 @@ public class NodeOutputResource extends AbstractResource { private boolean dataMovement; private String dataNameLocation; private boolean requiredToCMD; + private String searchQuery; + private String appArgument; + + public String getSearchQuery() { + return searchQuery; + } + + public void setSearchQuery(String searchQuery) { + this.searchQuery = searchQuery; + } + + public String getAppArgument() { + return appArgument; + } + + public void setAppArgument(String appArgument) { + this.appArgument = appArgument; + } + public boolean getRequiredToCMD() { return requiredToCMD; @@ -156,6 +175,8 @@ public class NodeOutputResource extends AbstractResource { nodeOutput.setRequiredToCMD(requiredToCMD); nodeOutput.setDataMovement(dataMovement); nodeOutput.setDataNameLocation(dataNameLocation); + nodeOutput.setApplicationArgument(appArgument); + nodeOutput.setSearchQuery(searchQuery); if (existingOutput != null) { existingOutput.setNode(nodeDetail); @@ -167,6 +188,8 @@ public class NodeOutputResource extends AbstractResource { existingOutput.setRequiredToCMD(requiredToCMD); existingOutput.setDataMovement(dataMovement); existingOutput.setDataNameLocation(dataNameLocation); + existingOutput.setApplicationArgument(appArgument); + existingOutput.setSearchQuery(searchQuery); nodeOutput = em.merge(existingOutput); } else { em.persist(nodeOutput); http://git-wip-us.apache.org/repos/asf/airavata/blob/dc22b7be/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 9935e55..f815505 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 @@ -546,6 +546,8 @@ public class Utils { eOutputResource.setRequiredToCMD(o.isRequiredToCMD()); eOutputResource.setDataMovement(o.isDataMovement()); eOutputResource.setDataNameLocation(o.getDataNameLocation()); + eOutputResource.setSearchQuery(o.getSearchQuery()); + eOutputResource.setAppArgument(o.getApplicationArgument()); } return eOutputResource; } @@ -642,6 +644,8 @@ public class Utils { outputResource.setRequiredToCMD(o.isAddedToCmd()); outputResource.setDataMovement(o.isDataMovement()); outputResource.setDataNameLocation(o.getDataNameLocation()); + outputResource.setSearchQuery(o.getSearchQuery()); + outputResource.setAppArgument(o.getApplicationArgument()); } return outputResource; } @@ -678,6 +682,8 @@ public class Utils { outputResource.setRequiredToCMD(o.isRequiredToCMD()); outputResource.setDataMovement(o.isDataMovement()); outputResource.setDataNameLocation(o.getDataNameLocation()); + outputResource.setSearchQuery(o.getSearchQuery()); + outputResource.setAppArgument(o.getApplicationArgument()); } return outputResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/dc22b7be/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 4e63656..7a9c32d 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 @@ -248,7 +248,9 @@ public class ThriftDataModelConversion { dataObjectType.setIsRequired(expOutput.getRequired()); dataObjectType.setRequiredToAddedToCommandLine(expOutput.getRequiredToCMD()); dataObjectType.setDataMovement(expOutput.isDataMovement()); - dataObjectType.setDataNameLocation(expOutput.getDataNameLocation()); + dataObjectType.setLocation(expOutput.getDataNameLocation()); + dataObjectType.setSearchQuery(expOutput.getSearchQuery()); + dataObjectType.setApplicationArgument(expOutput.getAppArgument()); return dataObjectType; }else if (object instanceof NodeOutputResource){ NodeOutputResource nodeOutputResource = (NodeOutputResource)object; @@ -260,7 +262,9 @@ public class ThriftDataModelConversion { dataObjectType.setIsRequired(nodeOutputResource.getRequired()); dataObjectType.setRequiredToAddedToCommandLine(nodeOutputResource.getRequiredToCMD()); dataObjectType.setDataMovement(nodeOutputResource.isDataMovement()); - dataObjectType.setDataNameLocation(nodeOutputResource.getDataNameLocation()); + dataObjectType.setLocation(nodeOutputResource.getDataNameLocation()); + dataObjectType.setSearchQuery(nodeOutputResource.getSearchQuery()); + dataObjectType.setApplicationArgument(nodeOutputResource.getAppArgument()); return dataObjectType; }else if (object instanceof ApplicationOutputResource){ ApplicationOutputResource outputResource = (ApplicationOutputResource)object; @@ -272,7 +276,9 @@ public class ThriftDataModelConversion { dataObjectType.setType(DataType.valueOf(outputResource.getDataType())); } dataObjectType.setDataMovement(outputResource.isDataMovement()); - dataObjectType.setDataNameLocation(outputResource.getDataNameLocation()); + dataObjectType.setLocation(outputResource.getDataNameLocation()); + dataObjectType.setSearchQuery(outputResource.getSearchQuery()); + dataObjectType.setApplicationArgument(outputResource.getAppArgument()); return dataObjectType; }else { return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/dc22b7be/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 8f31a3f..8516950 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 @@ -149,6 +149,8 @@ CREATE TABLE EXPERIMENT_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -226,6 +228,8 @@ CREATE TABLE APPLICATION_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -258,6 +262,8 @@ CREATE TABLE NODE_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT 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/dc22b7be/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 374db98..855c7cc 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 @@ -149,6 +149,8 @@ CREATE TABLE EXPERIMENT_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -207,6 +209,8 @@ CREATE TABLE APPLICATION_OUTPUT IS_REQUIRED SMALLINT, REQUIRED_TO_COMMANDLINE SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -239,6 +243,8 @@ CREATE TABLE NODE_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT 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/dc22b7be/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 8f31a3f..8516950 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 @@ -149,6 +149,8 @@ CREATE TABLE EXPERIMENT_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -226,6 +228,8 @@ CREATE TABLE APPLICATION_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -258,6 +262,8 @@ CREATE TABLE NODE_OUTPUT REQUIRED_TO_COMMANDLINE SMALLINT, DATA_MOVEMENT SMALLINT, DATA_NAME_LOCATION VARCHAR(255), + SEARCH_QUERY VARCHAR(255), + APP_ARGUMENT VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY), FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE );
