You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/02 22:43:08 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
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/1fc24132
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1fc24132
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1fc24132
Branch: refs/heads/master
Commit: 1fc24132210e8ae9e88336b55eb852356d03529f
Parents: 720be04 07c3f78
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jul 2 16:42:45 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jul 2 16:42:45 2014 -0400
----------------------------------------------------------------------
.../lib/applicationInterfaceModel_types.cpp | 12 +--
.../lib/applicationInterfaceModel_types.h | 18 ++--
.../Model/AppCatalog/AppInterface/Types.php | 16 +--
.../appinterface/InputDataObjectType.java | 104 +++++++++----------
.../airavata/model/util/AppDeploymentUtil.java | 50 +++++++++
.../airavata/model/util/AppInterfaceUtil.java | 71 +++++++++++++
.../model/util/ComputeResourceUtil.java | 84 +++++++++++++++
.../applicationInterfaceModel.thrift | 2 +-
.../data/impl/ApplicationInterfaceImpl.java | 4 +-
.../catalog/data/impl/ComputeResourceImpl.java | 2 +-
.../data/resources/AbstractResource.java | 4 +-
.../resources/AppModuleMappingResource.java | 4 +-
.../resources/DataMovementProtocolResource.java | 14 +--
.../data/util/AppCatalogThriftConversion.java | 2 +-
.../app/catalog/test/AppDeploymentTest.java | 1 -
.../app/catalog/test/AppInterfaceTest.java | 24 ++++-
.../app/catalog/test/ComputeResourceTest.java | 39 +++++++
17 files changed, 356 insertions(+), 95 deletions(-)
----------------------------------------------------------------------