You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/10/20 13:01:49 UTC
[3/4] airavata git commit: Merge remote-tracking branch
'upstream/develop' into user-compute-bug-resolve
Merge remote-tracking branch 'upstream/develop' into user-compute-bug-resolve
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e159a031
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e159a031
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e159a031
Branch: refs/heads/develop
Commit: e159a03165f38287551f708f44a832db7f9af630
Parents: ff48f8c d521922
Author: Anuj Bhandar <bh...@gmail.com>
Authored: Fri Oct 14 16:04:54 2016 -0400
Committer: Anuj Bhandar <bh...@gmail.com>
Committed: Fri Oct 14 16:04:54 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 10 +-
modules/sharing-registry/api-docs/index.html | 77 +++
.../sharing-registry/api-docs/sharing_cpi.html | 240 ++++++++
.../api-docs/sharing_models.html | 165 +++++
modules/sharing-registry/api-docs/style.css | 184 ++++++
.../repositories/PermissionTypeRepository.java | 4 +-
.../server/SharingRegistryServerHandler.java | 34 +-
.../SharingRegistryServerHandlerTest.java | 4 +-
.../sharing/registry/models/Domain.java | 27 +-
.../sharing/registry/models/Entity.java | 2 +-
.../sharing/registry/models/EntityType.java | 2 +-
.../registry/models/GroupMembership.java | 2 +-
.../sharing/registry/models/PermissionType.java | 2 +-
.../sharing/registry/models/SearchCriteria.java | 2 +-
.../sharing/registry/models/Sharing.java | 2 +-
.../models/SharingRegistryException.java | 2 +-
.../airavata/sharing/registry/models/User.java | 28 +-
.../sharing/registry/models/UserGroup.java | 2 +-
.../service/cpi/SharingRegistryService.java | 615 ++++++++++++++++---
.../thrift_models/sharing_cpi.thrift | 8 +-
.../thrift_models/thrift-gen.sh | 9 +-
21 files changed, 1279 insertions(+), 142 deletions(-)
----------------------------------------------------------------------