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/d62a957d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d62a957d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d62a957d Branch: refs/heads/master Commit: d62a957dbb159ba41a42c03b242c5c3b21241d98 Parents: a429677 404913a Author: lahiru <[email protected]> Authored: Fri Aug 15 02:14:12 2014 +0530 Committer: lahiru <[email protected]> Committed: Fri Aug 15 02:14:12 2014 +0530 ---------------------------------------------------------------------- .../conf/airavata-client-properties.ini | 2 +- .../resources/conf/app-catalog-identifiers.ini | 3 +- .../client/samples/CreateLaunchExperiment.java | 48 +- .../samples/TestCreateLaunchExperiment.java | 19 + .../tools/RegisterSampleApplications.java | 8 +- .../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 +- 46 files changed, 1977 insertions(+), 1161 deletions(-) ----------------------------------------------------------------------
