Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/44277183 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/44277183 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/44277183 Branch: refs/heads/develop Commit: 442771830e316a096204b02142a34793d8ee02c0 Parents: 0b29a5c d0c6957 Author: Shameera Rathnayaka <[email protected]> Authored: Thu Aug 18 16:05:58 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Thu Aug 18 16:05:58 2016 -0400 ---------------------------------------------------------------------- .../lib/airavata/workspace_model_types.cpp | 30 ++++- .../lib/airavata/workspace_model_types.h | 15 ++- .../lib/Airavata/Model/Workspace/Types.php | 25 ++++ .../apache/airavata/model/workspace/ttypes.py | 18 ++- .../airavata/model/workspace/Gateway.java | 114 ++++++++++++++++++- .../model/workspace/GatewayApprovalStatus.java | 5 +- .../catalog/impl/GatewayRegistry.java | 4 +- .../core/experiment/catalog/model/Gateway.java | 10 ++ .../catalog/resources/GatewayResource.java | 11 ++ .../experiment/catalog/resources/Utils.java | 2 +- .../utils/ThriftDataModelConversion.java | 1 + .../src/main/resources/expcatalog-derby.sql | 14 +++ .../src/main/resources/expcatalog-mysql.sql | 14 +++ .../workspace_model.thrift | 6 +- 14 files changed, 252 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
