Merge branches 'AIRAVATA-2507' and 'AIRAVATA-2508'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b8aaabc6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b8aaabc6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b8aaabc6 Branch: refs/heads/develop Commit: b8aaabc694bbea95fbd6647a95a9c1f9cda769f7 Parents: 784d3de b279904 52d9238 Author: Marcus Christie <[email protected]> Authored: Tue Oct 10 15:57:31 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Tue Oct 10 15:57:31 2017 -0400 ---------------------------------------------------------------------- .../core/impl/TenantManagementKeycloakImpl.java | 14 +++--- .../interfaces/TenantManagementInterface.java | 3 +- .../services/core/tests/SetupNewGateway.java | 2 +- .../handlers/IamAdminServicesHandler.java | 13 +++-- .../handlers/TenantProfileServiceHandler.java | 50 ++++++++++++++++++++ .../templates/airavata-server.properties.j2 | 1 - .../common/utils/ApplicationSettings.java | 4 -- .../airavata/common/utils/ServerSettings.java | 1 - .../main/resources/airavata-server.properties | 1 - .../service/handler/RegistryServerHandler.java | 15 ++++++ 10 files changed, 84 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b8aaabc6/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java ----------------------------------------------------------------------
