No Suresh. This will not affect the 0.12 release. I still have to commit the resource layer along with the tests.
Thanks, Sachith Withana > On Jun 21, 2014, at 12:49 AM, Suresh Marru <[email protected]> wrote: > > Sachith, > > I am assuming this will not break the 0.12 release? I haven’t tested this, > but just being watchful for commits between RC1 and the release. > > Suresh > >> On Jun 19, 2014, at 11:34 PM, [email protected] wrote: >> >> Repository: airavata >> Updated Branches: >> refs/heads/master 2bcadf554 -> 48cd362a5 >> >> >> adding app catalog data models >> >> >> Project: http://git-wip-us.apache.org/repos/asf/airavata/repo >> Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/48cd362a >> Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/48cd362a >> Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/48cd362a >> >> Branch: refs/heads/master >> Commit: 48cd362a54293593d140c7ccd806c9f1be8283d4 >> Parents: 2bcadf5 >> Author: Sachith Withana <[email protected]> >> Authored: Fri Jun 20 09:06:29 2014 +0530 >> Committer: Sachith Withana <[email protected]> >> Committed: Fri Jun 20 09:06:29 2014 +0530 >> >> ---------------------------------------------------------------------- >> .../appcatalog/jpa/model/Application.java | 77 ++++++++++++ >> .../jpa/model/ApplicationDeployment.java | 29 +++++ >> .../jpa/model/ApplicationDeploymentPk.java | 40 ++++++ >> .../jpa/model/ApplicationInputOutputs.java | 68 ++++++++++ >> .../jpa/model/ApplicationInputOutputsPK.java | 39 ++++++ >> .../appcatalog/jpa/model/ComputeResource.java | 68 ++++++++++ >> .../jpa/model/DataMovementProtocol.java | 75 +++++++++++ >> .../jpa/model/DataMovementProtocolPK.java | 72 +++++++++++ >> .../appcatalog/jpa/model/Deployment.java | 124 +++++++++++++++++++ >> .../appcatalog/jpa/model/GSISSHExport.java | 64 ++++++++++ >> .../appcatalog/jpa/model/GSISSHExportPK.java | 62 ++++++++++ >> .../jpa/model/GSISSHPostJobCommand.java | 66 ++++++++++ >> .../jpa/model/GSISSHPostJobCommandPK.java | 62 ++++++++++ >> .../jpa/model/GSISSHPreJobCommand.java | 64 ++++++++++ >> .../jpa/model/GSISSHPreJobCommandPK.java | 62 ++++++++++ >> .../appcatalog/jpa/model/GSISSHSubmission.java | 102 +++++++++++++++ >> .../jpa/model/GatewayApplications.java | 68 ++++++++++ >> .../jpa/model/GatewayApplicationsPK.java | 40 ++++++ >> .../appcatalog/jpa/model/GatewayProfile.java | 43 +++++++ >> .../jpa/model/GlobusJobSubmission.java | 92 ++++++++++++++ >> .../appcatalog/jpa/model/InputOutputs.java | 67 ++++++++++ >> .../jpa/model/JobSubmissionProtocol.java | 76 ++++++++++++ >> .../jpa/model/JobSubmissionProtocolPK.java | 72 +++++++++++ >> .../appcatalog/jpa/model/SCPDataMovement.java | 82 ++++++++++++ >> .../appcatalog/jpa/model/SSHSubmission.java | 82 ++++++++++++ >> .../src/main/resources/appcatalog-mysql_new.sql | 14 +-- >> 26 files changed, 1703 insertions(+), 7 deletions(-) >> ---------------------------------------------------------------------- >> >> >> http://git-wip-us.apache.org/repos/asf/airavata/blob/48cd362a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Application.java >> ---------------------------------------------------------------------- >> diff --git >> a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Application.java >> >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Application.java >> new file mode 100644 >> index 0000000..8c64d0c >> --- /dev/null >> +++ >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Application.java >> @@ -0,0 +1,77 @@ >> +package org.apache.airavata.persistence.appcatalog.jpa.model; >> + >> +import javax.persistence.*; >> + >> +@Entity >> +@Table(name = "GATEWAY_PROFILE") >> +public class Application { >> + >> + @Id >> + @Column(name = "APPLICATION_ID") >> + private String applicationID; >> + @Column(name = "APPLICATION_NAME") >> + private String applicationName; >> + >> + // the gateway that owns the application >> + @Column(name = "GATEWAY_ID") >> + private String gatewayID; >> + >> + //whether the appliation is publicly available or not >> + @Column(name = "IS_PUBLIC") >> + private boolean published; >> + @Column(name = "APPLICATION_DESCRIPTION") >> + private String applicationDescription; >> + >> + >> + @ManyToOne(cascade= CascadeType.MERGE) >> + @JoinColumn(name = "GATEWAY_ID") >> + private GatewayProfile gatewayProfile; >> + >> + public GatewayProfile getGatewayProfile() { >> + return gatewayProfile; >> + } >> + >> + public void setGatewayProfile(GatewayProfile gatewayProfile) { >> + this.gatewayProfile = gatewayProfile; >> + } >> + >> + public String getApplicationID() { >> + return applicationID; >> + } >> + >> + public void setApplicationID(String applicationID) { >> + this.applicationID = applicationID; >> + } >> + >> + public String getApplicationName() { >> + return applicationName; >> + } >> + >> + public void setApplicationName(String applicationName) { >> + this.applicationName = applicationName; >> + } >> + >> + public String getGatewayID() { >> + return gatewayID; >> + } >> + >> + public void setGatewayID(String gatewayID) { >> + this.gatewayID = gatewayID; >> + } >> + >> + public boolean isPublished() { >> + return published; >> + } >> + >> + public void setPublished(boolean published) { >> + this.published = published; >> + } >> + >> + public String getApplicationDescription() { >> + return applicationDescription; >> + } >> + >> + public void setApplicationDescription(String applicationDescription) { >> + this.applicationDescription = applicationDescription; >> + } >> +} >> >> http://git-wip-us.apache.org/repos/asf/airavata/blob/48cd362a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java >> ---------------------------------------------------------------------- >> diff --git >> a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java >> >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java >> new file mode 100644 >> index 0000000..a1290d3 >> --- /dev/null >> +++ >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java >> @@ -0,0 +1,29 @@ >> +package org.apache.airavata.persistence.appcatalog.jpa.model; >> + >> +import javax.persistence.*; >> + >> +@Entity >> +@Table(name = "GATEWAY_PROFILE") >> +@IdClass(ApplicationDeploymentPK.class) >> +public class ApplicationDeployment { >> + >> + @Id >> + @Column(name = "DEPLOYMENT_ID") >> + private String deploymentID; >> + >> + @Id >> + @Column(name = "APPLICATION_ID") >> + private String applicationID; >> + >> + @Column(name = "DEPLOYMENT_HOST_NAME") >> + private String deploymentHostName; >> + >> + >> + @ManyToOne(cascade = CascadeType.REMOVE) >> + @JoinColumn(name = "DEPLOYMENT_ID") >> + private Deployment deployment; >> + >> + @ManyToOne(cascade = CascadeType.REMOVE) >> + @JoinColumn(name = "APPLICATION_ID") >> + private Application application; >> +} >> >> http://git-wip-us.apache.org/repos/asf/airavata/blob/48cd362a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeploymentPk.java >> ---------------------------------------------------------------------- >> diff --git >> a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeploymentPk.java >> >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeploymentPk.java >> new file mode 100644 >> index 0000000..a5695aa >> --- /dev/null >> +++ >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeploymentPk.java >> @@ -0,0 +1,40 @@ >> +package org.apache.airavata.persistence.appcatalog.jpa.model; >> + >> +public class ApplicationDeploymentPK { >> + private String deploymentID; >> + private String applicationID; >> + >> + public ApplicationDeploymentPK(String deploymentID, String >> applicationID) { >> + this.deploymentID = deploymentID; >> + this.applicationID = applicationID; >> + } >> + >> + public ApplicationDeploymentPK() { >> + } >> + >> + @Override >> + public boolean equals(Object o) { >> + return false; >> + } >> + >> + @Override >> + public int hashCode() { >> + return 1; >> + } >> + >> + public String getDeploymentID() { >> + return deploymentID; >> + } >> + >> + public void setDeploymentID(String deploymentID) { >> + this.deploymentID = deploymentID; >> + } >> + >> + public String getApplicationID() { >> + return applicationID; >> + } >> + >> + public void setApplicationID(String applicationID) { >> + this.applicationID = applicationID; >> + } >> +} >> >> http://git-wip-us.apache.org/repos/asf/airavata/blob/48cd362a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputs.java >> ---------------------------------------------------------------------- >> diff --git >> a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputs.java >> >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputs.java >> new file mode 100644 >> index 0000000..2d3fed1 >> --- /dev/null >> +++ >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputs.java >> @@ -0,0 +1,68 @@ >> +package org.apache.airavata.persistence.appcatalog.jpa.model; >> + >> +import javax.persistence.*; >> + >> +@Entity >> +@Table(name = "APPLICATION_INPUT_OUTPUTS") >> +@IdClass(ApplicationInputOutputsPK.class) >> +public class ApplicationInputOutputs { >> + >> + @Id >> + @Column(name = "APPLICATION_ID") >> + private String applicationID; >> + >> + @Id >> + @Column(name = "INPUT_OUTPUT_ID") >> + private String inputOutputID; >> + >> + @Column(name = "IS_INPUT") >> + private boolean input; >> + >> + @OneToOne(cascade = CascadeType.REMOVE) >> + @JoinColumn(name = "INPUT_OUTPUT_ID") >> + private InputOutputs inputOutputs; >> + >> + @ManyToOne(cascade = CascadeType.REMOVE) >> + @JoinColumn(name = "APPLICATION_ID") >> + private Application application; >> + >> + public String getApplicationID() { >> + return applicationID; >> + } >> + >> + public void setApplicationID(String applicationID) { >> + this.applicationID = applicationID; >> + } >> + >> + public String getInputOutputID() { >> + return inputOutputID; >> + } >> + >> + public void setInputOutputID(String inputOutputID) { >> + this.inputOutputID = inputOutputID; >> + } >> + >> + public boolean isInput() { >> + return input; >> + } >> + >> + public void setInput(boolean input) { >> + this.input = input; >> + } >> + >> + public InputOutputs getInputOutputs() { >> + return inputOutputs; >> + } >> + >> + public void setInputOutputs(InputOutputs inputOutputs) { >> + this.inputOutputs = inputOutputs; >> + } >> + >> + public Application getApplication() { >> + return application; >> + } >> + >> + public void setApplication(Application application) { >> + this.application = application; >> + } >> +} >> >> http://git-wip-us.apache.org/repos/asf/airavata/blob/48cd362a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputsPK.java >> ---------------------------------------------------------------------- >> diff --git >> a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputsPK.java >> >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputsPK.java >> new file mode 100644 >> index 0000000..715b5be >> --- /dev/null >> +++ >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationInputOutputsPK.java >> @@ -0,0 +1,39 @@ >> +package org.apache.airavata.persistence.appcatalog.jpa.model; >> + >> +public class ApplicationInputOutputsPK { >> + private String applicationID; >> + private String inputOutputID; >> + >> + public ApplicationInputOutputsPK(String applicationID, String >> inputOutputID) { >> + this.applicationID = applicationID; >> + this.inputOutputID = inputOutputID; >> + } >> + >> + public ApplicationInputOutputsPK() { >> + } >> + @Override >> + public boolean equals(Object o) { >> + return false; >> + } >> + >> + @Override >> + public int hashCode() { >> + return 1; >> + } >> + >> + public String getApplicationID() { >> + return applicationID; >> + } >> + >> + public void setApplicationID(String applicationID) { >> + this.applicationID = applicationID; >> + } >> + >> + public String getInputOutputID() { >> + return inputOutputID; >> + } >> + >> + public void setInputOutputID(String inputOutputID) { >> + this.inputOutputID = inputOutputID; >> + } >> +} >> >> http://git-wip-us.apache.org/repos/asf/airavata/blob/48cd362a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ComputeResource.java >> ---------------------------------------------------------------------- >> diff --git >> a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ComputeResource.java >> >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ComputeResource.java >> new file mode 100644 >> index 0000000..b9cc227 >> --- /dev/null >> +++ >> b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ComputeResource.java >> @@ -0,0 +1,68 @@ >> +package org.apache.airavata.persistence.appcatalog.jpa.model; >> + >> +import javax.persistence.Column; >> +import javax.persistence.Entity; >> +import javax.persistence.Id; >> +import javax.persistence.Table; >> + >> +@Entity >> +@Table(name = "COMPUTE_RESOURCE") >> +public class ComputeResource { >> + >> + >> + @Id >> + @Column(name = "RESOURCE_ID") >> + private String applicationID; >> + >> + @Column(name = "HOST_NAME") >> + private String hostname; >> + >> + @Column(name = "IP_ADDRESS") >> + private String ipAddress; >> + >> + @Column(name = "DESCRIPTION") >> + private String description; >> + >> + @Column(name = "PREFERRED_JOB_SUBMISSION_PROTOCOL ") >> + private String preferredJobSubmissionProtocol; >> + >> + public String getApplicationID() { >> + return applicationID; >> + } >> + >> + public void setApplicationID(String applicationID) { >> + this.applicationID = applicationID; >> + } >> + >> + public String getHostname() { >> + return hostname; >> + } >> + >> + public void setHostname(String hostname) { >> + this.hostname = hostname; >> + } >> + >> + public String getIpAddress() { >> + return ipAddress; >> + } >> + >> + public void setIpAddress(String ipAddress) { >> + this.ipAddress = ipAddress; >> + } >> + >> + public String getDescription() { >> + return description; >> + } >> + >> + public void setDescription(String description) { >> + th
