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/03/07 22:27:54 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/0888365c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0888365c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0888365c
Branch: refs/heads/develop
Commit: 0888365cafa19858c677af1de11434c1b9e29be5
Parents: 4e80197 7fbc624
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Mar 7 16:24:43 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Mar 7 16:24:43 2016 -0500
----------------------------------------------------------------------
.../application_interface_model_types.cpp | 22 ++++
.../application_interface_model_types.h | 12 +-
.../Model/AppCatalog/AppInterface/Types.php | 23 ++++
.../model/appcatalog/appinterface/ttypes.py | 15 ++-
.../ApplicationInterfaceDescription.java | 113 ++++++++++++++++++-
.../main/resources/airavata-server.properties | 3 +-
.../catalog/impl/ApplicationInterfaceImpl.java | 2 +
.../app/catalog/model/ApplicationInterface.java | 11 +-
.../catalog/resources/AppInterfaceResource.java | 11 ++
.../util/AppCatalogThriftConversion.java | 1 +
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 6 +-
.../application_interface_model.thrift | 3 +-
13 files changed, 211 insertions(+), 12 deletions(-)
----------------------------------------------------------------------