You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/10/23 00:38:08 UTC
[airavata] 01/01: Merge branch 'staging' into develop
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 0e11ed44e5ccdf062f00297a2c72bb0def3af015
Merge: 4784822 c94f3be
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Oct 22 20:37:18 2019 -0400
Merge branch 'staging' into develop
.asf.yaml | 11 +
.../model/group/ResourcePermissionType.java | 2 +-
.../pfec-hydro-production/group_vars/pga/vars.yml | 12 +-
.../production/pga_config/epwgateway/vars.yml | 1 +
.../{southdakota => snowvision}/vars.yml | 34 ++--
.../production/pga_config/snowvision/vault.yml | 18 ++
.../production/pga_config/southdakota/vars.yml | 6 +-
dev-tools/ansible/pga-scigap-prod.yml | 3 +-
.../participant/airavata-server.properties.j2 | 3 +-
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 6 +-
.../airavata/helix/adaptor/PoolingSSHJClient.java | 87 ++++----
.../src/main/assembly/participant-bin-assembly.xml | 4 +
.../src/main/assembly/post-wm-bin-assembly.xml | 4 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 4 +
.../database_scripts/sharing-registry-mysql.sql | 5 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 3 +
.../DeltaScripts/sharingCatalog_schema_delta.sql | 4 +
.../sharing/registry/db/entities/DomainEntity.java | 13 +-
.../server/SharingRegistryServerHandler.java | 6 +
.../src/main/resources/sharing-registry-derby.sql | 3 +
.../src/main/resources/sharing-registry-mysql.sql | 5 +-
.../registry/SharingRegistryServerHandlerTest.java | 35 ++++
.../airavata/sharing/registry/models/Domain.java | 141 +++++++++++--
.../registry/models/DuplicateEntryException.java | 12 +-
.../airavata/sharing/registry/models/Entity.java | 70 +++----
.../sharing/registry/models/EntityType.java | 32 ++-
.../sharing/registry/models/GroupAdmin.java | 17 +-
.../sharing/registry/models/GroupMembership.java | 36 ++--
.../sharing/registry/models/PermissionType.java | 32 ++-
.../sharing/registry/models/SearchCriteria.java | 25 +--
.../airavata/sharing/registry/models/Sharing.java | 46 ++---
.../registry/models/SharingRegistryException.java | 12 +-
.../airavata/sharing/registry/models/User.java | 50 ++---
.../sharing/registry/models/UserGroup.java | 60 ++----
.../sharing-service-docs/api-docs/sharing_cpi.html | 224 ++++++++++-----------
.../api-docs/sharing_models.html | 70 +++----
.../sharing-models/sharing_models.thrift | 6 +-
37 files changed, 607 insertions(+), 495 deletions(-)