From commits-return-19474-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Tue Jul 17 22:51:13 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2585F180600 for ; Tue, 17 Jul 2018 22:51:12 +0200 (CEST) Received: (qmail 18195 invoked by uid 500); 17 Jul 2018 20:51:12 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 18182 invoked by uid 99); 17 Jul 2018 20:51:12 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2018 20:51:12 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B3B1181EA1; Tue, 17 Jul 2018 20:51:11 +0000 (UTC) Date: Tue, 17 Jul 2018 20:51:12 +0000 To: "commits@airavata.apache.org" Subject: [airavata] 01/01: Merge pull request #198 from sachinkariyattin/group-based-auth MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: machristie@apache.org In-Reply-To: <153186067162.25382.10606054120718745052@gitbox.apache.org> References: <153186067162.25382.10606054120718745052@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/group-based-auth X-Git-Reftype: branch X-Git-Rev: 96c54e24e0ec8c4872d9f1e4fe8d7414e2af4d2e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180717205111.B3B1181EA1@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch group-based-auth in repository https://gitbox.apache.org/repos/asf/airavata.git commit 96c54e24e0ec8c4872d9f1e4fe8d7414e2af4d2e Merge: 7a0cce1 f8f78c0 Author: Marcus Christie AuthorDate: Tue Jul 17 16:51:08 2018 -0400 Merge pull request #198 from sachinkariyattin/group-based-auth [AIRAVATA-2725] : GroupManagerService - add list of admins to GroupModel .../registry/db/entities/GroupAdminEntity.java | 14 ++ .../registry/db/entities/UserGroupEntity.java | 12 ++ .../server/SharingRegistryServerHandler.java | 7 + .../registry/SharingRegistryServerHandlerTest.java | 20 ++- .../registry/SharingRegistryServiceTest.java | 33 +++- .../sharing/registry/models/UserGroup.java | 169 ++++++++++++++++++++- .../api-docs/sharing_models.html | 2 + .../thrift_models/sharing_models.thrift | 4 +- 8 files changed, 248 insertions(+), 13 deletions(-)