Repository: airavata Updated Branches: refs/heads/master 8ce513c28 -> b4e3c33fd
http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java index 043bdb6..2ddabcd 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ApplicationOutputResource.java @@ -50,6 +50,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { private boolean requiredToCMD; private String searchQuery; private String appArgument; + private boolean outputStreaming; private AppInterfaceResource appInterfaceResource; @@ -296,6 +297,7 @@ public class ApplicationOutputResource extends AppCatAbstractResource { applicationOutput.setDataNameLocation(dataNameLocation); applicationOutput.setSearchQuery(searchQuery); applicationOutput.setApplicationArgument(appArgument); + applicationOutput.setOutputStreaming(outputStreaming); em.merge(applicationOutput); em.getTransaction().commit(); em.close(); @@ -430,4 +432,12 @@ public class ApplicationOutputResource extends AppCatAbstractResource { public void setAppArgument(String appArgument) { this.appArgument = appArgument; } + + public boolean isOutputStreaming() { + return outputStreaming; + } + + public void setOutputStreaming(boolean outputStreaming) { + this.outputStreaming = outputStreaming; + } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java index 463c827..f6bd161 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java @@ -843,6 +843,7 @@ public class AppCatalogJPAUtils { resource.setDataNameLocation(o.getDataNameLocation()); resource.setSearchQuery(o.getSearchQuery()); resource.setAppArgument(o.getApplicationArgument()); + resource.setOutputStreaming(o.isOutputStreaming()); resource.setAppInterfaceResource((AppInterfaceResource)createAppInterfaceResource(o.getApplicationInterface())); } return resource; http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java index bbebaa0..af88c58 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java @@ -623,6 +623,7 @@ public class AppCatalogThriftConversion { outputDataObjectType.setLocation(output.getDataNameLocation()); outputDataObjectType.setSearchQuery(output.getSearchQuery()); outputDataObjectType.setApplicationArgument(output.getAppArgument()); + outputDataObjectType.setOutputStreaming(output.isOutputStreaming()); return outputDataObjectType; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java index d8530d1..6fa6c4e 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java @@ -193,6 +193,7 @@ public class ExperimentRegistry { resource.setDataMovement(output.isDataMovement()); resource.setLocation(output.getLocation()); resource.setSearchQuery(output.getSearchQuery()); + resource.setOutputStreaming(output.isOutputStreaming()); resource.save(); } } catch (Exception e) { @@ -367,6 +368,7 @@ public class ExperimentRegistry { resource.setDataMovement(output.isDataMovement()); resource.setLocation(output.getLocation()); resource.setSearchQuery(output.getSearchQuery()); + resource.setOutputStreaming(output.isOutputStreaming()); resource.save(); } return processID; @@ -657,6 +659,7 @@ public class ExperimentRegistry { resource.setLocation(output.getLocation()); resource.setApplicationArgument(output.getApplicationArgument()); resource.setSearchQuery(output.getSearchQuery()); + resource.setOutputStreaming(output.isOutputStreaming()); resource.save(); } } @@ -823,6 +826,7 @@ public class ExperimentRegistry { resource.setLocation(output.getLocation()); resource.setApplicationArgument(output.getApplicationArgument()); resource.setSearchQuery(output.getSearchQuery()); + resource.setOutputStreaming(output.isOutputStreaming()); resource.save(); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java index 244fb08..ead2148 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java @@ -37,11 +37,13 @@ public class ExperimentOutput { private String applicationArgument; private boolean isRequired; private boolean requiredToAddedToCmd; + private boolean outputStreaming; private boolean dataMovement; private String location; private String searchQuery; private Experiment experiment; + @Id @Column(name = "EXPERIMENT_ID") public String getExperimentId() { @@ -95,6 +97,15 @@ public class ExperimentOutput { return isRequired; } + @Column(name = "OUTPUT_STREAMING") + public boolean isOutputStreaming(){ + return outputStreaming; + } + + public void setOutputStreaming(boolean outputStreaming) { + this.outputStreaming = outputStreaming; + } + public void setIsRequired(boolean isRequired) { this.isRequired = isRequired; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java index b66673d..ddf53b3 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java @@ -42,6 +42,7 @@ public class ProcessOutput { private String location; private String searchQuery; private Process process; + private boolean outputStreaming; @Id @Column(name = "PROCESS_ID") @@ -136,7 +137,16 @@ public class ProcessOutput { this.searchQuery = searchQuery; } -// @Override + @Column(name = "OUTPUT_STREAMING") + public boolean isOutputStreaming() { + return outputStreaming; + } + + public void setOutputStreaming(boolean outputStreaming) { + this.outputStreaming = outputStreaming; + } + + // @Override // public boolean equals(Object o) { // if (this == o) return true; // if (o == null || getClass() != o.getClass()) return false; http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java index 8789681..7a60366 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentOutputResource.java @@ -45,6 +45,7 @@ public class ExperimentOutputResource extends AbstractExpCatResource { private boolean dataMovement; private String location; private String searchQuery; + private boolean outputStreaming; public String getExperimentId() { return experimentId; @@ -126,6 +127,14 @@ public class ExperimentOutputResource extends AbstractExpCatResource { this.searchQuery = searchQuery; } + public void setOutputStreaming(boolean outputStreaming) { + this.outputStreaming = outputStreaming; + } + + public boolean isOutputStreaming() { + return outputStreaming; + } + public ExperimentCatResource create(ResourceType type) throws RegistryException { logger.error("Unsupported resource type for process output data resource.", new UnsupportedOperationException()); throw new UnsupportedOperationException(); @@ -186,6 +195,7 @@ public class ExperimentOutputResource extends AbstractExpCatResource { experimentOutput.setDataMovement(dataMovement); experimentOutput.setLocation(location); experimentOutput.setSearchQuery(searchQuery); + experimentOutput.setOutputStreaming(outputStreaming); if (existingExpOutput == null){ em.persist(experimentOutput); }else { http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java index 71370c2..290ee9a 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessOutputResource.java @@ -45,6 +45,7 @@ public class ProcessOutputResource extends AbstractExpCatResource { private boolean dataMovement; private String location; private String searchQuery; + private boolean outputStreaming; public String getProcessId() { return processId; @@ -126,6 +127,14 @@ public class ProcessOutputResource extends AbstractExpCatResource { this.searchQuery = searchQuery; } + public boolean isOutputStreaming() { + return outputStreaming; + } + + public void setOutputStreaming(boolean outputStreaming) { + this.outputStreaming = outputStreaming; + } + public ExperimentCatResource create(ResourceType type) throws RegistryException { logger.error("Unsupported resource type for process output data resource.", new UnsupportedOperationException()); throw new UnsupportedOperationException(); @@ -187,6 +196,7 @@ public class ProcessOutputResource extends AbstractExpCatResource { processOutput.setDataMovement(dataMovement); processOutput.setLocation(location); processOutput.setSearchQuery(searchQuery); + processOutput.setOutputStreaming(outputStreaming); if (existingProcessOutput == null){ em.persist(processOutput); }else { http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java index 599a9ae..620c96f 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java @@ -460,6 +460,7 @@ public class Utils { outputResource.setDataMovement(o.getDataMovement()); outputResource.setLocation(o.getLocation()); outputResource.setSearchQuery(o.getSearchQuery()); + outputResource.setOutputStreaming(o.isOutputStreaming()); } return outputResource; } @@ -580,6 +581,7 @@ public class Utils { outputResource.setDataMovement(o.getDataMovement()); outputResource.setLocation(o.getLocation()); outputResource.setSearchQuery(o.getSearchQuery()); + outputResource.setOutputStreaming(o.isOutputStreaming()); } return outputResource; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java index 0640dc8..d66c780 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java @@ -201,6 +201,7 @@ public class ThriftDataModelConversion { dataObjectType.setDataMovement(outputResource.getDataMovement()); dataObjectType.setLocation(outputResource.getLocation()); dataObjectType.setSearchQuery(outputResource.getSearchQuery()); + dataObjectType.setOutputStreaming(outputResource.isOutputStreaming()); return dataObjectType; }else if (object instanceof ProcessOutputResource) { ProcessOutputResource outputResource = (ProcessOutputResource) object; @@ -213,6 +214,7 @@ public class ThriftDataModelConversion { dataObjectType.setDataMovement(outputResource.getDataMovement()); dataObjectType.setLocation(outputResource.getLocation()); dataObjectType.setSearchQuery(outputResource.getSearchQuery()); + dataObjectType.setOutputStreaming(outputResource.isOutputStreaming()); return dataObjectType; } else { return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql index bfe50ad..4ee6555 100644 --- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql +++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql @@ -309,6 +309,7 @@ CREATE TABLE APPLICATION_OUTPUT DATA_NAME_LOCATION VARCHAR(255), SEARCH_QUERY VARCHAR(255), APP_ARGUMENT VARCHAR(255), + OUTPUT_STREAMING SMALLINT, PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY), FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql index fdfede5..b38bdf5 100644 --- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql @@ -307,6 +307,7 @@ CREATE TABLE APPLICATION_OUTPUT DATA_NAME_LOCATION VARCHAR(255), SEARCH_QUERY VARCHAR(255), APP_ARGUMENT VARCHAR(255), + OUTPUT_STREAMING SMALLINT, PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY), FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql index 4c5e8fc..90e99c3 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql @@ -114,6 +114,7 @@ CREATE TABLE EXPERIMENT_OUTPUT DATA_MOVEMENT SMALLINT, LOCATION varchar(255), SEARCH_QUERY varchar(255), + OUTPUT_STREAMING SMALLINT, PRIMARY KEY(EXPERIMENT_ID,OUTPUT_NAME), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -222,6 +223,7 @@ CREATE TABLE PROCESS_OUTPUT DATA_MOVEMENT SMALLINT, LOCATION varchar(255), SEARCH_QUERY varchar(255), + OUTPUT_STREAMING SMALLINT, PRIMARY KEY(PROCESS_ID,OUTPUT_NAME), FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql index 6ee7527..92c5251 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql @@ -114,6 +114,7 @@ CREATE TABLE EXPERIMENT_OUTPUT DATA_MOVEMENT tinyint(1), LOCATION varchar(255), SEARCH_QUERY varchar(255), + OUTPUT_STREAMING SMALLINT, PRIMARY KEY(EXPERIMENT_ID,OUTPUT_NAME), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -223,6 +224,7 @@ CREATE TABLE PROCESS_OUTPUT DATA_MOVEMENT tinyint(1), LOCATION varchar(255), SEARCH_QUERY varchar(255), + OUTPUT_STREAMING SMALLINT, PRIMARY KEY(PROCESS_ID,OUTPUT_NAME), FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/b4e3c33f/thrift-interface-descriptions/airavata-api/application_io_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/application_io_models.thrift b/thrift-interface-descriptions/airavata-api/application_io_models.thrift index 56c5b54..1749ced 100644 --- a/thrift-interface-descriptions/airavata-api/application_io_models.thrift +++ b/thrift-interface-descriptions/airavata-api/application_io_models.thrift @@ -113,5 +113,6 @@ struct OutputDataObjectType { 6: optional bool requiredToAddedToCommandLine, 7: optional bool dataMovement, 8: optional string location, - 9: optional string searchQuery + 9: optional string searchQuery, + 10: optional bool outputStreaming } \ No newline at end of file
