adding created time and update time to app catalog
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/404913ac Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/404913ac Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/404913ac Branch: refs/heads/master Commit: 404913acd380787b98ddf8c0673dcb10bf6e1087 Parents: b19a8e0 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Aug 14 16:24:26 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Aug 14 16:24:26 2014 -0400 ---------------------------------------------------------------------- .../conf/airavata-client-properties.ini | 2 +- .../resources/conf/app-catalog-identifiers.ini | 3 +- .../client/samples/CreateLaunchExperiment.java | 48 +- .../samples/TestCreateLaunchExperiment.java | 19 + .../data/model/ApplicationDeployment.java | 22 + .../data/model/ApplicationInterface.java | 23 + .../catalog/data/model/ApplicationModule.java | 23 + .../catalog/data/model/ComputeResource.java | 27 +- .../data/model/DataMovementInterface.java | 28 +- .../data/model/DataMovementProtocol.java | 152 ++-- .../data/model/DataMovementProtocolPK.java | 148 ++-- .../catalog/data/model/GatewayProfile.java | 23 + .../catalog/data/model/GridftpDataMovement.java | 27 +- .../catalog/data/model/GridftpEndpoint.java | 30 +- .../data/model/JobSubmissionInterface.java | 28 +- .../data/model/JobSubmissionProtocol.java | 154 ++-- .../data/model/JobSubmissionProtocolPK.java | 148 ++-- .../catalog/data/model/LocalSubmission.java | 27 +- .../catalog/data/model/ResourceJobManager.java | 23 + .../catalog/data/model/ScpDataMovement.java | 28 +- .../catalog/data/model/SshJobSubmission.java | 28 +- .../catalog/data/model/Workflow.java | 23 + .../data/resources/AppDeploymentResource.java | 21 + .../data/resources/AppInterfaceResource.java | 21 + .../data/resources/AppModuleResource.java | 21 + .../data/resources/ComputeResourceResource.java | 25 +- .../DataMovementInterfaceResource.java | 21 + .../resources/DataMovementProtocolResource.java | 720 +++++++++---------- .../data/resources/GatewayProfileResource.java | 21 + .../resources/GridftpDataMovementResource.java | 21 + .../data/resources/GridftpEndpointResource.java | 21 + .../JobSubmissionInterfaceResource.java | 21 + .../JobSubmissionProtocolResource.java | 718 +++++++++--------- .../data/resources/LocalSubmissionResource.java | 21 + .../resources/ResourceJobManagerResource.java | 21 + .../data/resources/ScpDataMovementResource.java | 21 + .../resources/SshJobSubmissionResource.java | 21 + .../data/resources/WorkflowResource.java | 21 + .../catalog/data/util/AppCatalogJPAUtils.java | 126 +++- .../data/util/AppCatalogThriftConversion.java | 32 +- .../src/main/resources/META-INF/persistence.xml | 2 - .../src/main/resources/appcatalog-derby.sql | 68 +- .../src/main/resources/appcatalog-mysql.sql | 62 +- .../src/test/resources/appcatalog-derby.sql | 68 +- .../src/main/resources/registry-mysql.sql | 2 +- 45 files changed, 1973 insertions(+), 1157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini index 0fc113d..959a77f 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini @@ -8,7 +8,7 @@ THRIFT_LIB_DIR = "../lib/Thrift/" AIRAVATA_PHP_STUBS_DIR = "../lib/Airavata/" ; Host which runs the Airavata Server -AIRAVATA_SERVER = "gw56.iu.xsede.org" +AIRAVATA_SERVER = "gw111.iu.xsede.org" ;AIRAVATA_SERVER = "localhost" ; Airavata Server thrift port http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini index 7380248..9771085 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/app-catalog-identifiers.ini @@ -11,4 +11,5 @@ wrfInterfaceId=WRF_a390e041-cae3-4b85-9bb9-e03df666deb9 autoDockInterfaceId= nwChemInterfaceId=NWChem_bdc7b97a-dd39-49cb-b203-6d779781d5c8 lammpsInterfaceId=LAMMPS_f43520e2-b77a-4f11-b3b7-98693349fcd0 -echoInterfaceId=Echo_271e6d47-a5db-434e-8453-e27985b7ea59 +#echoInterfaceId=Echo_271e6d47-a5db-434e-8453-e27985b7ea59 +echoInterfaceId=Echo_c6e6aaac-7d9d-44fc-aba2-63b5100528e8 http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index 967577c..5178965 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@ -37,13 +37,17 @@ import org.apache.airavata.client.tools.DocumentCreator; import org.apache.airavata.client.tools.DocumentCreatorNew; import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.model.util.ExperimentModelUtil; +import org.apache.airavata.persistance.registry.jpa.model.ErrorDetail; import org.apache.airavata.schemas.gfac.InputParameterType; import org.apache.airavata.schemas.gfac.OutputParameterType; import org.apache.airavata.schemas.gfac.ParameterType; +import org.apache.airavata.workflow.model.component.system.StreamSourceComponent; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.xmlsoap.schemas.soap.encoding.*; +import java.lang.String; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -60,8 +64,8 @@ public class CreateLaunchExperiment { private static Airavata.Client client; private static String localHostAppId = "localhost_9c5b098c-8906-4be1-9ef3-a7706c9b1e2c,SimpleEcho0_315d9b93-2cdb-4c1b-8dc3-d2077936f5ae"; private static String sshHostAppId; - private static String pbsEchoAppId = "trestles.sdsc.edu_849a1136-7e0a-4f4a-b835-322a83b967b6,SimpleEcho2_f89d3b8c-6f22-4a77-a9f5-a4df88785ab6"; - private static String pbsWRFAppId = "trestles.sdsc.edu_00482169-8fc4-4633-b779-5ca1f66f27c1,WRF_0f1e90d3-5915-4629-a5a4-73346c1e7535"; + private static String pbsEchoAppId = "trestles.sdsc.edu_d4b6dfd0-d273-4499-b5dd-19b7f83176ed,SimpleEcho2_060f9325-3f72-4ff6-b8a2-8a2b4911e09d"; + private static String pbsWRFAppId = "trestles.sdsc.edu_03d239f1-b923-487a-9aa4-fcc7aed8628e,WRF_a5a7372d-2c59-4986-8351-eac563b53f89"; private static String slurmAppId = "stampede.tacc.xsede.org_b2ef59cb-f626-4767-9ca0-601f94c42ba4,SimpleEcho3_b81c2559-a088-42a3-84ce-40119d874918"; private static String sgeAppId; private static String br2EchoAppId = "bigred2_9c1e6be8-f7d8-4494-98f2-bf508790e8c6,SimpleEchoBR_149fd613-98e2-46e7-ac7c-4d393349469e"; @@ -76,13 +80,14 @@ public class CreateLaunchExperiment { try { AiravataUtils.setExecutionAsClient(); client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); - System.out.println("API version is " + client.getAPIVersion()); - addDescriptors(); +// System.out.println("API version is " + client.getAPIVersion()); +// getExperiment(client, "WRFExperiment_2a2de26c-7f74-47c9-8e14-40e50dedfe0f"); +// addDescriptors(); //// final String expId = createExperimentForSSHHost(airavata); -//// final String expId = createExperimentForTrestles(client); + final String expId = createExperimentForTrestles(client); //// final String expId = createExperimentForStampede(client); - final String expId = createExperimentForLocalHost(client); +// final String expId = createExperimentForLocalHost(client); // final String expId = createExperimentForLonestar(airavata); // final String expId = createExperimentWRFTrestles(client); // final String expId = createExperimentForBR2(client); @@ -248,17 +253,17 @@ public class CreateLaunchExperiment { DataObjectType input = new DataObjectType(); input.setKey("WRF_Namelist"); input.setType(DataType.URI); - input.setValue("/Users/lahirugunathilake/Downloads/wrf_sample_inputs/namelist.input"); + input.setValue("/Users/chathuri/Downloads/wrf_sample_inputs/namelist1.input"); DataObjectType input1 = new DataObjectType(); input1.setKey("WRF_Input_File"); input1.setType(DataType.URI); - input1.setValue("/Users/lahirugunathilake/Downloads/wrf_sample_inputs/wrfinput_d01"); + input1.setValue("/Users/chathuri/Downloads/wrf_sample_inputs/wrfinput1_d01"); DataObjectType input2 = new DataObjectType(); input2.setKey("WRF_Boundary_File"); input2.setType(DataType.URI); - input2.setValue("/Users/lahirugunathilake/Downloads/wrf_sample_inputs/wrfbdy_d01"); + input2.setValue("/Users/chathuri/Downloads/wrf_sample_inputs/wrfbdy_d011"); exInputs.add(input); exInputs.add(input1); @@ -918,4 +923,29 @@ public class CreateLaunchExperiment { } return null; } + + public static void getExperiment (Airavata.Client client, String expId) throws Exception{ + try{ + Experiment experiment = client.getExperiment(expId); + List<ErrorDetails> errors = experiment.getErrors(); + if (errors != null && !errors.isEmpty()){ + for (ErrorDetails error : errors){ + System.out.println("ERROR MESSAGE : " + error.getActualErrorMessage()); + } + } + + } catch (ExperimentNotFoundException e) { + logger.error("Experiment does not exist", e); + throw new ExperimentNotFoundException("Experiment does not exist"); + } catch (AiravataSystemException e) { + logger.error("Error while retrieving experiment", e); + throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); + } catch (InvalidRequestException e) { + logger.error("Error while retrieving experiment", e); + throw new InvalidRequestException("Error while retrieving experiment"); + } catch (AiravataClientException e) { + logger.error("Error while retrieving experiment", e); + throw new AiravataClientException(AiravataErrorType.INTERNAL_ERROR); + } + } } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java index 9f17835..f5612aa 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java @@ -39,6 +39,7 @@ import org.apache.airavata.model.workspace.Project; import org.apache.airavata.model.workspace.experiment.*; import org.apache.airavata.model.workspace.experiment.Experiment; import org.apache.airavata.persistance.registry.jpa.model.*; +import org.apache.airavata.workflow.model.component.system.SystemComponent; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,6 +150,24 @@ public class TestCreateLaunchExperiment { } } + public static void getAllAppInterfaces (Airavata.Client client){ + try { + Map<String, String> allApps = client.getAllApplicationInterfaceNames(); + for (String id : allApps.keySet()){ + System.out.println("app id : " + id); + System.out.println("app name : " + allApps.get(id)); + } + } catch (AiravataSystemException e) { + e.printStackTrace(); + } catch (InvalidRequestException e) { + e.printStackTrace(); + } catch (AiravataClientException e) { + e.printStackTrace(); + }catch (TException e) { + e.printStackTrace(); + } + } + public static void getAppModule (Airavata.Client client, String moduleId){ try { ApplicationModule applicationModule = client.getApplicationModule(moduleId); http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java index 24fda20..9cca5eb 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java @@ -23,6 +23,7 @@ package org.apache.aiaravata.application.catalog.data.model; import javax.persistence.*; import java.io.Serializable; +import java.sql.Timestamp; @Entity @Table(name = "APPLICATION_DEPLOYMENT") @@ -49,6 +50,27 @@ public class ApplicationDeployment implements Serializable { @JoinColumn(name = "COMPUTE_HOSTID") private ComputeResource computeResource; + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } public String getDeploymentID() { return deploymentID; http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java index 4e46f4f..c7c1ad2 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java @@ -26,6 +26,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import java.io.Serializable; +import java.sql.Timestamp; @Entity @Table(name = "APPLICATION_INTERFACE") @@ -37,6 +38,28 @@ public class ApplicationInterface implements Serializable { private String appName; @Column(name = "APPLICATION_DESCRIPTION") private String appDescription; + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + public String getInterfaceID() { return interfaceID; http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationModule.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationModule.java index d15ff8d..ece8c87 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationModule.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationModule.java @@ -26,6 +26,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import java.io.Serializable; +import java.sql.Timestamp; @Entity @Table(name = "APPLICATION_MODULE") @@ -39,6 +40,28 @@ public class ApplicationModule implements Serializable { private String moduleVersion; @Column(name = "MODULE_DESC") private String moduleDesc; + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + public String getModuleID() { return moduleID; http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java index 4d99407..2692a29 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.Column; import javax.persistence.Entity; @@ -44,8 +45,30 @@ public class ComputeResource implements Serializable { @Column(name = "HOST_NAME") private String hostName; - - public String getResourceDescription() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + public String getResourceDescription() { return resourceDescription; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementInterface.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementInterface.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementInterface.java index ff5e962..9ba1a6d 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementInterface.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementInterface.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -57,8 +58,31 @@ public class DataMovementInterface implements Serializable { @Column(name = "PRIORITY_ORDER") private int priorityOrder; - - public String getComputeResourceId() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + + public String getComputeResourceId() { return computeResourceId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocol.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocol.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocol.java index 4203e89..d45c4e8 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocol.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocol.java @@ -1,76 +1,76 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.aiaravata.application.catalog.data.model; - -import javax.persistence.*; -import java.io.Serializable; - -@Entity -@Table(name = "DATA_MOVEMENT_PROTOCOL") -@IdClass(DataMovementProtocolPK.class) -public class DataMovementProtocol implements Serializable { - @Id - @Column(name = "RESOURCE_ID") - private String resourceID; - @Id - @Column(name = "DATA_MOVE_ID") - private String dataMoveID; - @Id - @Column(name = "DATA_MOVE_TYPE") - private String dataMoveType; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "RESOURCE_ID") - private ComputeResource computeResource; - - public String getResourceID() { - return resourceID; - } - - public void setResourceID(String resourceID) { - this.resourceID = resourceID; - } - - public String getDataMoveID() { - return dataMoveID; - } - - public void setDataMoveID(String dataMoveID) { - this.dataMoveID = dataMoveID; - } - - public String getDataMoveType() { - return dataMoveType; - } - - public void setDataMoveType(String dataMoveType) { - this.dataMoveType = dataMoveType; - } - - public ComputeResource getComputeResource() { - return computeResource; - } - - public void setComputeResource(ComputeResource computeResource) { - this.computeResource = computeResource; - } -} +///* +// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// * +// */ +// +//package org.apache.aiaravata.application.catalog.data.model; +// +//import javax.persistence.*; +//import java.io.Serializable; +// +//@Entity +//@Table(name = "DATA_MOVEMENT_PROTOCOL") +//@IdClass(DataMovementProtocolPK.class) +//public class DataMovementProtocol implements Serializable { +// @Id +// @Column(name = "RESOURCE_ID") +// private String resourceID; +// @Id +// @Column(name = "DATA_MOVE_ID") +// private String dataMoveID; +// @Id +// @Column(name = "DATA_MOVE_TYPE") +// private String dataMoveType; +// +// @ManyToOne(cascade= CascadeType.MERGE) +// @JoinColumn(name = "RESOURCE_ID") +// private ComputeResource computeResource; +// +// public String getResourceID() { +// return resourceID; +// } +// +// public void setResourceID(String resourceID) { +// this.resourceID = resourceID; +// } +// +// public String getDataMoveID() { +// return dataMoveID; +// } +// +// public void setDataMoveID(String dataMoveID) { +// this.dataMoveID = dataMoveID; +// } +// +// public String getDataMoveType() { +// return dataMoveType; +// } +// +// public void setDataMoveType(String dataMoveType) { +// this.dataMoveType = dataMoveType; +// } +// +// public ComputeResource getComputeResource() { +// return computeResource; +// } +// +// public void setComputeResource(ComputeResource computeResource) { +// this.computeResource = computeResource; +// } +//} http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocolPK.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocolPK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocolPK.java index 9fed4b3..9e53d1f 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocolPK.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/DataMovementProtocolPK.java @@ -1,74 +1,74 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.aiaravata.application.catalog.data.model; - -import java.io.Serializable; - -public class DataMovementProtocolPK implements Serializable { - private String resourceID; - private String dataMoveID; - private String dataMoveType; - - public DataMovementProtocolPK(String resourceID, String dataMoveID, String dataMoveType) { - this.resourceID = resourceID; - this.dataMoveID = dataMoveID; - this.dataMoveType = dataMoveType; - } - - public DataMovementProtocolPK() { - ; - } - - @Override - public boolean equals(Object o) { - return false; - } - - @Override - public int hashCode() { - return 1; - } - - public String getResourceID() { - return resourceID; - } - - public void setResourceID(String resourceID) { - this.resourceID = resourceID; - } - - public String getDataMoveID() { - return dataMoveID; - } - - public void setDataMoveID(String dataMoveID) { - this.dataMoveID = dataMoveID; - } - - public String getDataMoveType() { - return dataMoveType; - } - - public void setDataMoveType(String dataMoveType) { - this.dataMoveType = dataMoveType; - } -} +///* +// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// * +// */ +// +//package org.apache.aiaravata.application.catalog.data.model; +// +//import java.io.Serializable; +// +//public class DataMovementProtocolPK implements Serializable { +// private String resourceID; +// private String dataMoveID; +// private String dataMoveType; +// +// public DataMovementProtocolPK(String resourceID, String dataMoveID, String dataMoveType) { +// this.resourceID = resourceID; +// this.dataMoveID = dataMoveID; +// this.dataMoveType = dataMoveType; +// } +// +// public DataMovementProtocolPK() { +// ; +// } +// +// @Override +// public boolean equals(Object o) { +// return false; +// } +// +// @Override +// public int hashCode() { +// return 1; +// } +// +// public String getResourceID() { +// return resourceID; +// } +// +// public void setResourceID(String resourceID) { +// this.resourceID = resourceID; +// } +// +// public String getDataMoveID() { +// return dataMoveID; +// } +// +// public void setDataMoveID(String dataMoveID) { +// this.dataMoveID = dataMoveID; +// } +// +// public String getDataMoveType() { +// return dataMoveType; +// } +// +// public void setDataMoveType(String dataMoveType) { +// this.dataMoveType = dataMoveType; +// } +//} http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GatewayProfile.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GatewayProfile.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GatewayProfile.java index 2809b53..0bcb096 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GatewayProfile.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GatewayProfile.java @@ -26,6 +26,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import java.io.Serializable; +import java.sql.Timestamp; @Entity @Table(name = "GATEWAY_PROFILE") @@ -37,6 +38,28 @@ public class GatewayProfile implements Serializable { private String gatewayName; @Column(name = "GATEWAY_DESC") private String gatewayDesc; + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + public String getGatewayID() { return gatewayID; http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpDataMovement.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpDataMovement.java index fcae1d6..1d5ac9e 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpDataMovement.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpDataMovement.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,8 +42,30 @@ public class GridftpDataMovement implements Serializable { @Column(name = "SECURITY_PROTOCOL") private String securityProtocol; - - public String getDataMovementInterfaceId() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + public String getDataMovementInterfaceId() { return dataMovementInterfaceId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpEndpoint.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpEndpoint.java index b9cf40b..be2a833 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpEndpoint.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridftpEndpoint.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -47,12 +48,35 @@ public class GridftpEndpoint implements Serializable { @Id @Column(name = "DATA_MOVEMENT_INTERFACE_ID") private String dataMovementInterfaceId; - + @ManyToOne(cascade= CascadeType.MERGE) @JoinColumn(name = "DATA_MOVEMENT_INTERFACE_ID") private GridftpDataMovement gridftpDataMovement; - - public String getEndpoint() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + + public String getEndpoint() { return endpoint; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionInterface.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionInterface.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionInterface.java index d8114c6..2b89ee7 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionInterface.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionInterface.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -57,8 +58,31 @@ public class JobSubmissionInterface implements Serializable { @Column(name = "PRIORITY_ORDER") private int priorityOrder; - - public String getJobSubmissionInterfaceId() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + + public String getJobSubmissionInterfaceId() { return jobSubmissionInterfaceId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocol.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocol.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocol.java index 3b1915c..d913e58 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocol.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocol.java @@ -1,77 +1,77 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.aiaravata.application.catalog.data.model; - -import javax.persistence.*; -import java.io.Serializable; - -@Entity -@Table(name = "JOB_SUBMISSION_PROTOCOL") -@IdClass(JobSubmissionProtocolPK.class) -public class JobSubmissionProtocol implements Serializable { - @Id - @Column(name = "RESOURCE_ID") - private String resourceID; - @Id - @Column(name = "SUBMISSION_ID") - private String submissionID; - - @Id - @Column(name = "JOB_TYPE") - private String jobType; - - @ManyToOne(cascade= CascadeType.MERGE) - @JoinColumn(name = "RESOURCE_ID") - private ComputeResource computeResource; - - public String getResourceID() { - return resourceID; - } - - public void setResourceID(String resourceID) { - this.resourceID = resourceID; - } - - public String getSubmissionID() { - return submissionID; - } - - public void setSubmissionID(String submissionID) { - this.submissionID = submissionID; - } - - public String getJobType() { - return jobType; - } - - public void setJobType(String jobType) { - this.jobType = jobType; - } - - public ComputeResource getComputeResource() { - return computeResource; - } - - public void setComputeResource(ComputeResource computeResource) { - this.computeResource = computeResource; - } -} +///* +// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// * +// */ +// +//package org.apache.aiaravata.application.catalog.data.model; +// +//import javax.persistence.*; +//import java.io.Serializable; +// +//@Entity +//@Table(name = "JOB_SUBMISSION_PROTOCOL") +//@IdClass(JobSubmissionProtocolPK.class) +//public class JobSubmissionProtocol implements Serializable { +// @Id +// @Column(name = "RESOURCE_ID") +// private String resourceID; +// @Id +// @Column(name = "SUBMISSION_ID") +// private String submissionID; +// +// @Id +// @Column(name = "JOB_TYPE") +// private String jobType; +// +// @ManyToOne(cascade= CascadeType.MERGE) +// @JoinColumn(name = "RESOURCE_ID") +// private ComputeResource computeResource; +// +// public String getResourceID() { +// return resourceID; +// } +// +// public void setResourceID(String resourceID) { +// this.resourceID = resourceID; +// } +// +// public String getSubmissionID() { +// return submissionID; +// } +// +// public void setSubmissionID(String submissionID) { +// this.submissionID = submissionID; +// } +// +// public String getJobType() { +// return jobType; +// } +// +// public void setJobType(String jobType) { +// this.jobType = jobType; +// } +// +// public ComputeResource getComputeResource() { +// return computeResource; +// } +// +// public void setComputeResource(ComputeResource computeResource) { +// this.computeResource = computeResource; +// } +//} http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocolPK.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocolPK.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocolPK.java index 04f6ed0..aefe87a 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocolPK.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/JobSubmissionProtocolPK.java @@ -1,74 +1,74 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.aiaravata.application.catalog.data.model; - -import java.io.Serializable; - -public class JobSubmissionProtocolPK implements Serializable { - private String resourceID; - private String submissionID; - private String jobType; - - public JobSubmissionProtocolPK(String resourceID, String submissionID, String jobType) { - this.resourceID = resourceID; - this.submissionID = submissionID; - this.jobType = jobType; - } - - public JobSubmissionProtocolPK() { - ; - } - - @Override - public boolean equals(Object o) { - return false; - } - - @Override - public int hashCode() { - return 1; - } - - public String getResourceID() { - return resourceID; - } - - public void setResourceID(String resourceID) { - this.resourceID = resourceID; - } - - public String getSubmissionID() { - return submissionID; - } - - public void setSubmissionID(String submissionID) { - this.submissionID = submissionID; - } - - public String getJobType() { - return jobType; - } - - public void setJobType(String jobType) { - this.jobType = jobType; - } -} +///* +// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// * +// */ +// +//package org.apache.aiaravata.application.catalog.data.model; +// +//import java.io.Serializable; +// +//public class JobSubmissionProtocolPK implements Serializable { +// private String resourceID; +// private String submissionID; +// private String jobType; +// +// public JobSubmissionProtocolPK(String resourceID, String submissionID, String jobType) { +// this.resourceID = resourceID; +// this.submissionID = submissionID; +// this.jobType = jobType; +// } +// +// public JobSubmissionProtocolPK() { +// ; +// } +// +// @Override +// public boolean equals(Object o) { +// return false; +// } +// +// @Override +// public int hashCode() { +// return 1; +// } +// +// public String getResourceID() { +// return resourceID; +// } +// +// public void setResourceID(String resourceID) { +// this.resourceID = resourceID; +// } +// +// public String getSubmissionID() { +// return submissionID; +// } +// +// public void setSubmissionID(String submissionID) { +// this.submissionID = submissionID; +// } +// +// public String getJobType() { +// return jobType; +// } +// +// public void setJobType(String jobType) { +// this.jobType = jobType; +// } +//} http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/LocalSubmission.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/LocalSubmission.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/LocalSubmission.java index 0378343..01df76b 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/LocalSubmission.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/LocalSubmission.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -48,8 +49,30 @@ public class LocalSubmission implements Serializable { @Id @Column(name = "JOB_SUBMISSION_INTERFACE_ID") private String jobSubmissionInterfaceId; - - public String getResourceJobManagerId() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + public String getResourceJobManagerId() { return resourceJobManagerId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java index ab485f8..65b0f3c 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ResourceJobManager.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.Column; import javax.persistence.Entity; @@ -47,6 +48,28 @@ public class ResourceJobManager implements Serializable { @Column(name = "RESOURCE_JOB_MANAGER_TYPE") private String resourceJobManagerType; + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } public String getResourceJobManagerId() { return resourceJobManagerId; http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java index 35317d2..3cf038b 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ScpDataMovement.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.Column; import javax.persistence.Entity; @@ -50,8 +51,31 @@ public class ScpDataMovement implements Serializable { @Column(name = "SSH_PORT") private int sshPort; - - public String getQueueDescription() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + + public String getQueueDescription() { return queueDescription; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java index bd29f7b..fc72881 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SshJobSubmission.java @@ -22,6 +22,7 @@ package org.apache.aiaravata.application.catalog.data.model; import java.io.Serializable; +import java.sql.Timestamp; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -57,8 +58,31 @@ public class SshJobSubmission implements Serializable { @Column(name = "SSH_PORT") private int sshPort; - - public String getResourceJobManagerId() { + + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + + + public String getResourceJobManagerId() { return resourceJobManagerId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java index 585b2ad..908c6fc 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/Workflow.java @@ -25,6 +25,7 @@ import org.apache.openjpa.persistence.DataCache; import javax.persistence.*; import java.io.Serializable; +import java.sql.Timestamp; @DataCache @Entity @@ -45,6 +46,28 @@ public class Workflow implements Serializable { @Column(name = "WF_TEMPLATE_ID") private String wfTemplateId; + @Column(name = "CREATION_TIME") + private Timestamp creationTime; + + @Column(name = "UPDATE_TIME") + private Timestamp updateTime; + + public Timestamp getCreationTime() { + return creationTime; + } + + public void setCreationTime(Timestamp creationTime) { + this.creationTime = creationTime; + } + + public Timestamp getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Timestamp updateTime) { + this.updateTime = updateTime; + } + public String getWfName() { return wfName; } http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java index 0f43bcb..6dfd69b 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import javax.persistence.EntityManager; import javax.persistence.Query; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -47,6 +48,24 @@ public class AppDeploymentResource extends AbstractResource { private String appDes; private ComputeResourceResource hostResource; private AppModuleResource moduleResource; + private Timestamp createdTime; + private Timestamp updatedTime; + + public Timestamp getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Timestamp createdTime) { + this.createdTime = createdTime; + } + + public Timestamp getUpdatedTime() { + return updatedTime; + } + + public void setUpdatedTime(Timestamp updatedTime) { + this.updatedTime = updatedTime; + } public String getDeploymentId() { return deploymentId; @@ -352,6 +371,7 @@ public class AppDeploymentResource extends AbstractResource { existingDeployment.setHostID(hostId); existingDeployment.setExecutablePath(executablePath); existingDeployment.setParallelism(parallelism); + existingDeployment.setUpdateTime(updatedTime); em.merge(existingDeployment); }else { ApplicationDeployment deployment = new ApplicationDeployment(); @@ -363,6 +383,7 @@ public class AppDeploymentResource extends AbstractResource { deployment.setComputeResource(computeHost); deployment.setExecutablePath(executablePath); deployment.setParallelism(parallelism); + deployment.setCreationTime(createdTime); em.persist(deployment); } em.getTransaction().commit(); http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java index ca88764..d013a9f 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import javax.persistence.EntityManager; import javax.persistence.Query; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -40,6 +41,24 @@ public class AppInterfaceResource extends AbstractResource { private String interfaceId; private String appName; private String appDescription; + private Timestamp createdTime; + private Timestamp updatedTime; + + public Timestamp getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Timestamp createdTime) { + this.createdTime = createdTime; + } + + public Timestamp getUpdatedTime() { + return updatedTime; + } + + public void setUpdatedTime(Timestamp updatedTime) { + this.updatedTime = updatedTime; + } public String getInterfaceId() { return interfaceId; @@ -283,12 +302,14 @@ public class AppInterfaceResource extends AbstractResource { if (existigAppInterface != null){ existigAppInterface.setAppName(appName); existigAppInterface.setAppDescription(appDescription); + existigAppInterface.setUpdateTime(updatedTime); em.merge(existigAppInterface); }else { ApplicationInterface applicationInterface = new ApplicationInterface(); applicationInterface.setInterfaceID(interfaceId); applicationInterface.setAppName(appName); applicationInterface.setAppDescription(appDescription); + applicationInterface.setCreationTime(createdTime); em.persist(applicationInterface); } em.getTransaction().commit(); http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java index adc2fa0..3da66c5 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import javax.persistence.EntityManager; import javax.persistence.Query; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,24 @@ public class AppModuleResource extends AbstractResource { private String moduleName; private String moduleVersion; private String moduleDesc; + private Timestamp createdTime; + private Timestamp updatedTime; + + public Timestamp getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Timestamp createdTime) { + this.createdTime = createdTime; + } + + public Timestamp getUpdatedTime() { + return updatedTime; + } + + public void setUpdatedTime(Timestamp updatedTime) { + this.updatedTime = updatedTime; + } public String getModuleId() { return moduleId; @@ -237,6 +256,7 @@ public class AppModuleResource extends AbstractResource { existingModule.setModuleName(moduleName); existingModule.setModuleVersion(moduleVersion); existingModule.setModuleDesc(moduleDesc); + existingModule.setUpdateTime(updatedTime); em.merge(existingModule); }else { ApplicationModule applicationModule = new ApplicationModule(); @@ -244,6 +264,7 @@ public class AppModuleResource extends AbstractResource { applicationModule.setModuleName(moduleName); applicationModule.setModuleVersion(moduleVersion); applicationModule.setModuleDesc(moduleDesc); + applicationModule.setCreationTime(createdTime); em.persist(applicationModule); } em.getTransaction().commit(); http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java index 51a1fa1..2ecaeb6 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import javax.persistence.EntityManager; import javax.persistence.Query; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -40,8 +41,26 @@ public class ComputeResourceResource extends AbstractResource { private String resourceDescription; private String resourceId; private String hostName; - - @Override + private Timestamp createdTime; + private Timestamp updatedTime; + + public Timestamp getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Timestamp createdTime) { + this.createdTime = createdTime; + } + + public Timestamp getUpdatedTime() { + return updatedTime; + } + + public void setUpdatedTime(Timestamp updatedTime) { + this.updatedTime = updatedTime; + } + + @Override public void remove(Object identifier) throws AppCatalogException { EntityManager em = null; try { @@ -246,8 +265,10 @@ public class ComputeResourceResource extends AbstractResource { em.getTransaction().begin(); if (existingComputeResource == null) { computeResource = new ComputeResource(); + computeResource.setCreationTime(createdTime); } else { computeResource = existingComputeResource; + computeResource.setUpdateTime(updatedTime); } computeResource.setResourceDescription(getResourceDescription()); computeResource.setResourceId(getResourceId()); http://git-wip-us.apache.org/repos/asf/airavata/blob/404913ac/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java index 37b8a9d..c9016ef 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java @@ -21,6 +21,7 @@ package org.apache.aiaravata.application.catalog.data.resources; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -47,6 +48,24 @@ public class DataMovementInterfaceResource extends AbstractResource { private String dataMovementProtocol; private String dataMovementInterfaceId; private int priorityOrder; + private Timestamp createdTime; + private Timestamp updatedTime; + + public Timestamp getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Timestamp createdTime) { + this.createdTime = createdTime; + } + + public Timestamp getUpdatedTime() { + return updatedTime; + } + + public void setUpdatedTime(Timestamp updatedTime) { + this.updatedTime = updatedTime; + } @Override public void remove(Object identifier) throws AppCatalogException { @@ -218,8 +237,10 @@ public class DataMovementInterfaceResource extends AbstractResource { em.getTransaction().begin(); if (existingDataMovementInterface == null) { dataMovementInterface = new DataMovementInterface(); + dataMovementInterface.setCreationTime(createdTime); } else { dataMovementInterface = existingDataMovementInterface; + dataMovementInterface.setUpdateTime(updatedTime); } dataMovementInterface.setComputeResourceId(getComputeResourceId()); ComputeResource computeResource = em.find(ComputeResource.class, getComputeResourceId());
