Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BD1D8200CD8 for ; Tue, 18 Jul 2017 19:43:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BBC02167386; Tue, 18 Jul 2017 17:43:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1627D16738E for ; Tue, 18 Jul 2017 19:43:48 +0200 (CEST) Received: (qmail 5696 invoked by uid 500); 18 Jul 2017 17:43:48 -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 5686 invoked by uid 99); 18 Jul 2017 17:43:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2017 17:43:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 85128E967F; Tue, 18 Jul 2017 17:43:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Tue, 18 Jul 2017 17:43:48 -0000 Message-Id: In-Reply-To: <4aafd48eec2e4cb19e74b9c5597c9bf4@git.apache.org> References: <4aafd48eec2e4cb19e74b9c5597c9bf4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata git commit: merge archived-at: Tue, 18 Jul 2017 17:43:49 -0000 merge Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/edd1dbbc Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/edd1dbbc Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/edd1dbbc Branch: refs/heads/develop Commit: edd1dbbc3f6b1e37b4a4e1bdc9d3322ee949c172 Parents: fe6e9a2 a0a66dc Author: scnakandala Authored: Tue Jul 18 13:43:42 2017 -0400 Committer: scnakandala Committed: Tue Jul 18 13:43:42 2017 -0400 ---------------------------------------------------------------------- .../core/impl/TenantManagementKeycloakImpl.java | 31 +- .../inventories/scigap/dreg-production/hosts | 10 +- .../production/files/client_truststore.jks | 395 +++++++++++++------ .../scigap/production/files/keycloak.jks | 143 +++++++ .../production/files/pga_config_0.17.php.j2 | 256 ++++++++++++ .../scigap/production/group_vars/all/vars.yml | 26 +- .../scigap/production/group_vars/all/vault.yml | 50 ++- .../ansible/inventories/scigap/production/hosts | 14 +- .../production/pga_config/accord/vars.yml | 66 ++++ .../production/pga_config/accord/vault.yml | 18 + .../production/pga_config/brandeis/vars.yml | 12 +- .../production/pga_config/brandeis/vault.yml | 34 +- .../production/pga_config/cinetvtech/vars.yml | 55 --- .../production/pga_config/cinetvtech/vault.yml | 18 - .../production/pga_config/gatech/vars.yml | 61 +++ .../production/pga_config/gatech/vault.yml | 18 + .../production/pga_config/georgiastate/vars.yml | 18 +- .../pga_config/georgiastate/vault.yml | 34 +- .../production/pga_config/iugateway/vars.yml | 16 +- .../production/pga_config/iugateway/vault.yml | 34 +- .../scigap/production/pga_config/lsu/vars.yml | 12 +- .../scigap/production/pga_config/lsu/vault.yml | 34 +- .../pga_config/nanoconfinement/vars.yml | 18 +- .../pga_config/nanoconfinement/vault.yml | 33 +- .../production/pga_config/nanoshape/vars.yml | 65 +++ .../production/pga_config/nanoshape/vault.yml | 18 + .../pga_config/newmexicostate/vars.yml | 61 +++ .../pga_config/newmexicostate/vault.yml | 18 + .../scigap/production/pga_config/nsg/vars.yml | 15 +- .../scigap/production/pga_config/nsg/vault.yml | 34 +- .../production/pga_config/oiitandy/vars.yml | 16 +- .../production/pga_config/oiitandy/vault.yml | 34 +- .../scigap/production/pga_config/oscer/vars.yml | 16 +- .../production/pga_config/oscer/vault.yml | 33 +- .../production/pga_config/phasta/vars.yml | 16 +- .../production/pga_config/phasta/vault.yml | 34 +- .../production/pga_config/scigap/vars.yml | 25 +- .../production/pga_config/scigap/vault.yml | 34 +- .../production/pga_config/seagrid/vars.yml | 21 +- .../production/pga_config/seagrid/vault.yml | 34 +- .../production/pga_config/simvascular/vars.yml | 12 +- .../production/pga_config/simvascular/vault.yml | 34 +- .../production/pga_config/southdakota/vars.yml | 16 +- .../production/pga_config/southdakota/vault.yml | 33 +- .../pga_config/southernillinois/vars.yml | 22 +- .../pga_config/southernillinois/vault.yml | 34 +- .../production/pga_config/testdrive/vars.yml | 20 +- .../production/pga_config/testdrive/vault.yml | 34 +- .../scigap/production/pga_config/uab/vars.yml | 61 +++ .../scigap/production/pga_config/uab/vault.yml | 18 + .../production/pga_config/ultrascan/vars.yml | 18 +- .../scigap/production/pga_config/utah/vars.yml | 18 +- .../scigap/production/pga_config/utah/vault.yml | 34 +- dev-tools/ansible/pga-scigap-prod.yml | 6 +- .../templates/airavata-server.properties.j2 | 5 + .../templates/airavata-server.properties.j2 | 5 + dev-tools/ansible/roles/pga/defaults/main.yml | 1 + .../roles/pga/tasks/install_deps_CentOS_7.yml | 1 + dev-tools/ansible/roles/pga/tasks/main.yml | 2 +- .../main/resources/airavata-server.properties | 7 +- modules/db-event-manager/pom.xml | 2 +- .../db/event/manager/DBEventManagerRunner.java | 67 +++- modules/distribution/pom.xml | 5 + .../catalog/resources/WorkerResource.java | 52 ++- .../RegistryServiceDBEventHandler.java | 7 +- .../sharingCatalog_keycloak_migration.sql | 2 +- .../org/apache/airavata/server/ServerMain.java | 8 +- .../db/repositories/AbstractRepository.java | 12 +- .../repositories/GroupMembershipRepository.java | 39 +- .../db/repositories/SharingRepository.java | 50 +-- .../db/repositories/UserGroupRepository.java | 31 +- .../db/repositories/UserRepository.java | 18 +- .../messaging/SharingServiceDBEventHandler.java | 7 +- .../server/SharingRegistryServerHandler.java | 3 +- pom.xml | 1 + .../tenant_profile_model.thrift | 20 +- 76 files changed, 1924 insertions(+), 661 deletions(-) ----------------------------------------------------------------------