Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/41a2c860 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/41a2c860 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/41a2c860 Branch: refs/heads/master Commit: 41a2c860efbc6897216c62cefa1b805c28188a37 Parents: 1a73058 87f6fbd Author: raminder <[email protected]> Authored: Fri Jun 20 11:26:15 2014 -0400 Committer: raminder <[email protected]> Committed: Fri Jun 20 11:26:15 2014 -0400 ---------------------------------------------------------------------- .../appcatalog/jpa/model/Application.java | 77 ++++++++++ .../jpa/model/ApplicationDeployment.java | 69 +++++++++ .../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 | 152 +++++++++++++++++++ .../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 | 16 +- 26 files changed, 1773 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
