airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [07/26] airavata git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Date Mon, 03 Jul 2017 20:31:57 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0d93a454
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0d93a454
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0d93a454

Branch: refs/heads/keycloak-prod-migration
Commit: 0d93a45403c5028e79528a5747057f92f781b628
Parents: 32e47de 67e8b52
Author: Gourav Shenoy <goshenoy@apache.org>
Authored: Fri Jun 30 12:08:10 2017 -0400
Committer: Gourav Shenoy <goshenoy@apache.org>
Committed: Fri Jun 30 12:08:10 2017 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |   123 -
 .../java/org/apache/airavata/api/Airavata.java  | 55575 +++++++----------
 .../resources/lib/Airavata/API/Airavata.php     | 11335 ++--
 .../lib/Airavata/Model/Workspace/Types.php      |   133 +-
 .../Iam/Admin/Services/CPI/IamAdminServices.php |  1783 +-
 .../Profile/Tenant/CPI/TenantProfileService.php |   359 +-
 .../model/tenant/TenantApprovalStatus.java      |     5 +-
 .../airavata/model/workspace/Gateway.java       |   688 +-
 .../model/workspace/GatewayApprovalStatus.java  |     9 +-
 .../core/impl/TenantManagementKeycloakImpl.java |   235 +-
 .../interfaces/TenantManagementInterface.java   |    66 +-
 .../services/core/tests/SetupNewGateway.java    |     4 +-
 .../profile/commons/utils/QueryConstants.java   |    12 +-
 .../handlers/IamAdminServicesHandler.java       |   143 +-
 .../handlers/TenantProfileServiceHandler.java   |    13 +-
 .../handlers/UserProfileServiceHandler.java     |    25 +-
 .../admin/services/cpi/IamAdminServices.java    |  5207 +-
 .../tenant/cpi/TenantProfileService.java        |     6 +
 .../repositories/TenantProfileRepository.java   |    23 +-
 .../repositories/UserProfileRepository.java     |    14 +
 .../security/KeyCloakSecurityManager.java       |     5 +-
 dev-tools/ansible/apiserver.yml                 |    34 +
 dev-tools/ansible/database.yml                  |    11 +
 .../scigap/develop/files/airavata.jks           |    76 +
 .../scigap/develop/files/airavata_sym.jks       |    30 +
 .../scigap/develop/files/client_truststore.jks  |   271 +
 .../scigap/develop/files/keycloak.jks           |   143 +
 .../scigap/develop/group_vars/all/vars.yml      |   141 +
 .../scigap/develop/group_vars/all/vault.yml     |    34 +
 .../ansible/inventories/scigap/develop/hosts    |    23 +
 .../scigap/develop/pga_config/scigap/vars.yml   |    58 +
 .../scigap/develop/pga_config/scigap/vault.yml  |    18 +
 .../scigap/develop/pga_config/seagrid/vars.yml  |    66 +
 .../scigap/develop/pga_config/seagrid/vault.yml |    18 +
 .../develop/pga_config/testdrive/vars.yml       |    65 +
 .../develop/pga_config/testdrive/vault.yml      |    18 +
 .../pga_config/nanoconfinement/vars.yml         |     8 +-
 .../testing-0.17-scigap/group_vars/all/vars.yml |     2 +-
 .../testing-0.17/group_vars/all/vars.yml        |     2 +-
 dev-tools/ansible/keycloak.yml                  |     9 +
 dev-tools/ansible/pga-scigap-dev.yml            |    26 +
 .../ansible/roles/api-orch/defaults/main.yml    |     6 +-
 .../files/mysql-connector-java-5.1.37-bin.jar   |   Bin 985603 -> 0 bytes
 dev-tools/ansible/roles/api-orch/tasks/main.yml |    12 +-
 .../templates/airavata-server.properties.j2     |    46 +-
 .../ansible/roles/database/tasks/keycloak.yml   |    38 +
 dev-tools/ansible/roles/database/tasks/main.yml |     3 +
 dev-tools/ansible/roles/gfac/defaults/main.yml  |     1 +
 .../files/mysql-connector-java-5.1.37-bin.jar   |   Bin 985603 -> 0 bytes
 dev-tools/ansible/roles/gfac/tasks/main.yml     |    11 +-
 .../templates/airavata-server.properties.j2     |    34 +-
 .../ansible/roles/keycloak/defaults/main.yml    |     9 +
 dev-tools/ansible/roles/keycloak/tasks/main.yml |    55 +-
 dev-tools/ansible/roles/pga/defaults/main.yml   |     7 +
 dev-tools/ansible/roles/pga/tasks/main.yml      |    19 +-
 .../roles/pga/templates/pga_config.php.j2       |    27 +-
 .../files/mysql-connector-java-5.1.37-bin.jar   |   Bin 985603 -> 0 bytes
 .../ansible/roles/zookeeper/tasks/main.yml      |     3 +
 .../airavata/common/utils/ServerSettings.java   |    10 +
 .../src/main/resources/PBS_Groovy.template      |     2 +-
 .../src/main/resources/SLURM_Groovy.template    |     1 +
 .../main/resources/airavata-server.properties   |    46 +-
 .../apache/airavata/gfac/core/GFacUtils.java    |    75 +-
 .../org/apache/airavata/gfac/core/Script.java   |     1 +
 .../gfac/core/context/ProcessContext.java       |    26 +-
 .../gfac/impl/task/SCPDataStageTask.java        |    16 +-
 .../src/main/resources/expcatalog-mysql.sql     |     2 +-
 .../DeltaScripts/expCatalog_schema_delta.sql    |     2 +-
 .../DeltaScripts/appCatalog_schema_delta.sql    |    30 +
 .../sharingCatalog_schema_delta.sql             |    10 +
 ...aCatalog_lowercase_user_data_dir_example.sql |    18 +
 .../credentialStore_keycloak_migration.sql      |     2 +
 .../expCatalog_keycloak_migration.sql           |    11 +
 .../profileService_keycloak_migration.sql       |     8 +
 .../sharingCatalog_keycloak_migration.sql       |     8 +
 .../0.17-0.18/migration-notes.md                |    17 +
 .../main/resources/sharing-registry-mysql.sql   |     8 +-
 .../airavata/KeycloakIdentityServerClient.java  |    22 +
 .../org/apache/airavata/MigrationManager.java   |    59 +-
 .../user-profile-migration.properties.template  |     1 +
 .../airavata-apis/airavata_api.thrift           |    38 -
 .../workspace_model.thrift                      |     3 +-
 .../tenant_profile_model.thrift                 |     3 +-
 .../iam-admin-services-cpi.thrift               |    42 +-
 .../profile-tenant/profile-tenant-cpi.thrift    |     3 +
 85 files changed, 36303 insertions(+), 41248 deletions(-)
----------------------------------------------------------------------



Mime
View raw message