You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/10 19:19:41 UTC
[2/2] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
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/12d9efb9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/12d9efb9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/12d9efb9
Branch: refs/heads/develop
Commit: 12d9efb90763b7b3cb20c6733804ea0a712186dd
Parents: e4cc54d 3a70c59
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Aug 10 15:19:30 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Aug 10 15:19:30 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 8 +-
.../lib/airavata/workspace_model_types.cpp | 22 ++++
.../lib/airavata/workspace_model_types.h | 12 +-
.../lib/Airavata/Model/Workspace/Types.php | 23 ++++
.../apache/airavata/model/workspace/ttypes.py | 15 ++-
.../airavata/model/workspace/Gateway.java | 111 ++++++++++++++++++-
.../catalog/impl/GatewayRegistry.java | 3 +
.../core/experiment/catalog/model/Gateway.java | 11 ++
.../catalog/resources/GatewayResource.java | 12 ++
.../experiment/catalog/resources/Utils.java | 3 +
.../utils/ThriftDataModelConversion.java | 1 +
.../service/handler/RegistryServerHandler.java | 12 ++
.../workspace_model.thrift | 3 +-
13 files changed, 227 insertions(+), 9 deletions(-)
----------------------------------------------------------------------