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 8fcc7a917700eb6f0afd76c61a252a3041e2e6e5 Merge: f04ac5f 4144f81 Author: Marcus Christie <[email protected]> AuthorDate: Thu Jul 19 12:41:25 2018 -0400 Merge branch 'group-based-auth' into develop airavata-api/airavata-api-server/pom.xml | 6 + .../api/server/handler/AiravataServerHandler.java | 1103 +- .../api/server/util/GatewayGroupsInitializer.java | 168 + .../server/util/GatewayGroupsInitializerTest.java | 125 + .../java/org/apache/airavata/api/Airavata.java | 114962 ++++++++++++------ .../main/resources/lib/Airavata/API/Airavata.php | 18003 ++- .../API/Sharing/SharingRegistryService.php | 4001 +- .../Model/AppCatalog/AccountProvisioning/Types.php | 345 + .../Model/AppCatalog/GatewayGroups/Types.php | 164 + .../AppCatalog/GroupResourceProfile/Types.php | 1380 + .../Model/AppCatalog/StorageResource/Types.php | 46 + .../Model/AppCatalog/UserResourceProfile/Types.php | 26 - .../lib/Airavata/Model/Data/Movement/Types.php | 69 + .../lib/Airavata/Model/Experiment/Types.php | 23 + .../resources/lib/Airavata/Model/Group/Types.php | 8 +- .../resources/lib/Airavata/Model/Process/Types.php | 23 + .../resources/lib/Airavata/Model/Sharing/Types.php | 121 + .../resources/lib/Airavata/Model/Status/Types.php | 92 + .../resources/lib/Airavata/Model/User/Types.php | 602 +- .../Iam/Admin/Services/CPI/IamAdminServices.php | 294 + .../Profile/Groupmanager/CPI/Error/Types.php | 95 + .../Groupmanager/CPI/GroupManagerService.php} | 2281 +- .../Service/Profile/Groupmanager/CPI/Types.php | 33 + .../Profile/User/CPI/UserProfileService.php | 477 +- .../resources/lib/airavata/api/Airavata-remote | 185 +- .../main/resources/lib/airavata/api/Airavata.py | 22037 ++-- .../api/sharing/SharingRegistryService-remote | 8 +- .../airavata/api/sharing/SharingRegistryService.py | 144 +- .../src/main/resources/lib/airavata/api/ttypes.py | 2 + .../model/appcatalog/gatewaygroups/__init__.py | 1 + .../model/appcatalog/gatewaygroups/constants.py | 12 + .../model/appcatalog/gatewaygroups/ttypes.py | 117 + .../appcatalog/groupresourceprofile/__init__.py | 1 + .../appcatalog/groupresourceprofile/constants.py | 12 + .../appcatalog/groupresourceprofile/ttypes.py | 838 + .../model/appcatalog/storageresource/ttypes.py | 26 +- .../model/appcatalog/userresourceprofile/ttypes.py | 17 +- .../lib/airavata/model/data/movement/ttypes.py | 38 +- .../lib/airavata/model/experiment/ttypes.py | 14 +- .../resources/lib/airavata/model/group/ttypes.py | 12 +- .../resources/lib/airavata/model/process/ttypes.py | 14 +- .../resources/lib/airavata/model/status/ttypes.py | 56 +- .../main/resources/lib/airavata/model/ttypes.py | 1 + .../groupmanager/cpi/GroupManagerService-remote | 14 + .../groupmanager/cpi/GroupManagerService.py | 540 +- .../iam/admin/services/cpi/IamAdminServices-remote | 7 + .../iam/admin/services/cpi/IamAdminServices.py | 233 + .../appcatalog/gatewaygroups/GatewayGroups.java | 680 + .../BatchQueueResourcePolicy.java | 993 + .../ComputeResourcePolicy.java | 744 + .../GroupAccountSSHProvisionerConfig.java | 692 + .../GroupComputeResourcePreference.java | 2224 + .../groupresourceprofile/GroupResourceProfile.java | 1288 + .../StorageResourceDescription.java | 204 +- .../userresourceprofile/UserResourceProfile.java | 115 +- .../model/data/movement/DataMovementInterface.java | 307 +- .../experiment/UserConfigurationDataModel.java | 113 +- .../apache/airavata/model/group/ResourceType.java | 8 +- .../airavata/model/process/ProcessModel.java | 113 +- .../airavata/model/status/ExperimentStatus.java | 113 +- .../apache/airavata/model/status/JobStatus.java | 113 +- .../airavata/model/status/ProcessStatus.java | 113 +- .../apache/airavata/model/status/TaskStatus.java | 113 +- .../airavata/model/user/CustomDashboard.java | 4 +- .../airavata/model/util/ExperimentModelUtil.java | 1 + .../core/impl/TenantManagementKeycloakImpl.java | 59 +- .../core/interfaces/TenantManagementInterface.java | 10 + .../admin/services/core/tests/SetupNewGateway.java | 21 + .../profile-service-commons/pom.xml | 26 +- .../handlers/GroupManagerServiceHandler.java | 188 +- .../profile/handlers/IamAdminServicesHandler.java | 14 + .../groupmanager/cpi/GroupManagerService.java | 4418 +- .../exception/GroupManagerServiceException.java | 4 +- .../cpi/group_manager_cpiConstants.java | 2 +- .../iam/admin/services/cpi/IamAdminServices.java | 1200 + .../profile-service/profile-tenant-core/pom.xml | 1 - .../profile-service/profile-user-core/pom.xml | 10 +- .../core/repositories/UserProfileRepository.java | 13 +- airavata-services/services-security/pom.xml | 11 + .../service/security/KeyCloakSecurityManager.java | 139 +- .../security/KeyCloakSecurityManagerTest.java | 278 + .../scigap/develop/group_vars/all/vault.yml | 66 +- .../scigap/dreg-production/group_vars/pga/vars.yml | 4 +- .../scigap/group-based-auth/files/airavata.jks | 76 + .../scigap/group-based-auth/files/airavata_sym.jks | 30 + .../group-based-auth/files/client_truststore.jks | 271 + .../scigap/group-based-auth/files/keycloak.jks | 143 + .../group-based-auth/group_vars/all/vars.yml | 141 + .../group-based-auth/group_vars/all/vault.yml | 34 + .../group-based-auth/group_vars/pga/vars.yml | 66 + .../group-based-auth/group_vars/pga/vault.yml | 18 + .../inventories/scigap/group-based-auth/hosts | 24 + .../scigap/production/pga_config/csbglsu/vars.yml | 17 +- .../pga_config/{searchingSRA => demo1}/vars.yml | 14 +- .../scigap/production/pga_config/demo1/vault.yml | 17 + .../pga_config/{searchingSRA => demo10}/vars.yml | 14 +- .../scigap/production/pga_config/demo10/vault.yml | 17 + .../pga_config/{searchingSRA => demo2}/vars.yml | 14 +- .../scigap/production/pga_config/demo2/vault.yml | 17 + .../pga_config/{searchingSRA => demo3}/vars.yml | 14 +- .../scigap/production/pga_config/demo3/vault.yml | 17 + .../pga_config/{searchingSRA => demo4}/vars.yml | 14 +- .../scigap/production/pga_config/demo4/vault.yml | 17 + .../pga_config/{searchingSRA => demo5}/vars.yml | 14 +- .../scigap/production/pga_config/demo5/vault.yml | 17 + .../pga_config/{searchingSRA => demo6}/vars.yml | 14 +- .../scigap/production/pga_config/demo6/vault.yml | 17 + .../pga_config/{searchingSRA => demo7}/vars.yml | 14 +- .../scigap/production/pga_config/demo7/vault.yml | 17 + .../pga_config/{searchingSRA => demo8}/vars.yml | 14 +- .../scigap/production/pga_config/demo8/vault.yml | 17 + .../pga_config/{searchingSRA => demo9}/vars.yml | 14 +- .../scigap/production/pga_config/demo9/vault.yml | 17 + .../production/pga_config/georgiastate/vars.yml | 6 +- .../pga_config/{csbglsu => interactwel}/vars.yml | 25 +- .../production/pga_config/interactwel/vault.yml | 18 + .../production/pga_config/iugateway/vars.yml | 4 +- .../production/pga_config/newUltrascan/vars.yml | 73 - .../production/pga_config/newUltrascan/vault.yml | 18 - .../pga_config/{csbglsu => nexttdb}/vars.yml | 25 +- .../scigap/production/pga_config/nexttdb/vault.yml | 18 + .../production/pga_config/searchingSRA/vars.yml | 15 +- .../pga_config/simvascular/files/pga_config.php.j2 | 7 +- .../production/pga_config/southdakota/vars.yml | 8 +- dev-tools/ansible/pga-scigap-prod.yml | 1 - .../gfac/templates/airavata-server.properties.j2 | 2 +- .../roles/gfac/templates/gfac-config.yaml.j2 | 4 + dev-tools/ansible/roles/java/tasks/main.yml | 8 +- .../roles/pga/templates/pga-ssl-vhost.conf.j2 | 7 + .../ansible/roles/pga/templates/pga-vhost.conf.j2 | 9 +- modules/distribution/pom.xml | 4 +- .../airavata/gfac/core/context/ProcessContext.java | 101 +- .../apache/airavata/gfac/impl/GFacEngineImpl.java | 20 + .../airavata/gfac/impl/HPCRemoteCluster.java | 5 +- .../airavata/gfac/impl/task/SCPDataStageTask.java | 44 +- .../impl/GroupResourceProfileValidator.java | 182 + .../server/OrchestratorServerHandler.java | 17 +- .../registry-refactoring}/pom.xml | 93 +- .../airavata/registry/core/RegistryException.java | 22 +- .../entities/appcatalog/AppEnvironmentEntity.java | 89 + .../appcatalog/AppModuleMappingEntity.java | 88 + .../entities/appcatalog/AppModuleMappingPK.java | 76 + .../appcatalog/ApplicationDeploymentEntity.java | 280 + .../appcatalog/ApplicationInputEntity.java | 200 + .../entities/appcatalog/ApplicationInputPK.java | 76 + .../appcatalog/ApplicationInterfaceEntity.java | 164 + .../appcatalog/ApplicationModuleEntity.java | 119 + .../appcatalog/ApplicationOutputEntity.java | 176 + .../entities/appcatalog/ApplicationOutputPK.java | 76 + .../core/entities/appcatalog/BatchQueueEntity.java | 205 + .../core/entities/appcatalog/BatchQueuePK.java | 76 + .../appcatalog/BatchQueueResourcePolicyEntity.java | 128 + .../appcatalog/BatchQueueResourcePolicyPK.java | 60 + .../appcatalog/CloudJobSubmissionEntity.java | 108 + .../entities/appcatalog/ComputeResourceEntity.java | 256 + .../ComputeResourceFileSystemEntity.java | 90 + .../appcatalog/ComputeResourceFileSystemPK.java | 78 + .../appcatalog/ComputeResourcePolicyEntity.java | 98 + .../ComputeResourcePreferenceEntity.java | 258 + .../appcatalog/ComputeResourcePreferencePK.java | 80 + .../appcatalog/DataMovementInterfaceEntity.java | 121 + .../appcatalog/DataMovementInterfacePK.java | 75 + .../entities/appcatalog/GatewayGroupsEntity.java | 101 + .../entities/appcatalog/GatewayProfileEntity.java | 130 + .../appcatalog/GlobusGkEndpointEntity.java | 63 + .../entities/appcatalog/GlobusGkEndpointPK.java | 76 + .../appcatalog/GlobusSubmissionEntity.java | 74 + .../appcatalog/GridftpDataMovementEntity.java | 87 + .../entities/appcatalog/GridftpEndpointEntity.java | 97 + .../entities/appcatalog/GridftpEndpointPK.java | 75 + .../appcatalog/GroupComputeResourcePrefEntity.java | 256 + .../appcatalog/GroupComputeResourcePrefPK.java | 68 + .../appcatalog/GroupResourceProfileEntity.java | 130 + .../appcatalog/GroupResourceProfilePK.java | 59 + .../GroupSSHAccountProvisionerConfig.java | 99 + .../GroupSSHAccountProvisionerConfigPK.java | 89 + .../entities/appcatalog/GsisshExportEntity.java | 62 + .../core/entities/appcatalog/GsisshExportPK.java | 76 + .../appcatalog/GsisshPostjobcommandEntity.java | 63 + .../appcatalog/GsisshPostjobcommandPK.java | 74 + .../appcatalog/GsisshPrejobcommandEntity.java | 62 + .../entities/appcatalog/GsisshPrejobcommandPK.java | 76 + .../appcatalog/GsisshSubmissionEntity.java | 96 + .../appcatalog/JobManagerCommandEntity.java | 87 + .../entities/appcatalog/JobManagerCommandPK.java | 77 + .../appcatalog/JobSubmissionInterfaceEntity.java | 121 + .../appcatalog/JobSubmissionInterfacePK.java | 75 + .../appcatalog/LibraryApendPathEntity.java | 84 + .../appcatalog/LibraryPrependPathEntity.java | 85 + .../appcatalog/LocalDataMovementEntity.java | 52 + .../entities/appcatalog/LocalSubmissionEntity.java | 108 + .../entities/appcatalog/ModuleLoadCmdEntity.java | 85 + .../core/entities/appcatalog/ModuleLoadCmdPK.java | 74 + .../appcatalog/ParallelismCommandEntity.java | 87 + .../entities/appcatalog/ParallelismCommandPK.java | 77 + .../entities/appcatalog/PostjobCommandEntity.java | 82 + .../core/entities/appcatalog/PostjobCommandPK.java | 73 + .../entities/appcatalog/PrejobCommandEntity.java | 82 + .../core/entities/appcatalog/PrejobCommandPK.java | 76 + .../appcatalog/ResourceJobManagerEntity.java | 107 + .../SSHAccountProvisionerConfiguration.java | 102 + .../SSHAccountProvisionerConfigurationPK.java | 62 + .../entities/appcatalog/ScpDataMovementEntity.java | 119 + .../appcatalog/SshJobSubmissionEntity.java | 143 + .../appcatalog/StorageInterfaceEntity.java | 121 + .../entities/appcatalog/StorageInterfacePK.java | 77 + .../appcatalog/StoragePreferenceEntity.java | 106 + .../entities/appcatalog/StoragePreferencePK.java | 75 + .../entities/appcatalog/StorageResourceEntity.java | 117 + .../appcatalog/UnicoreDatamovementEntity.java | 77 + .../appcatalog/UnicoreSubmissionEntity.java | 75 + .../UserComputeResourcePreferenceEntity.java | 198 + .../UserComputeResourcePreferencePK.java | 88 + .../appcatalog/UserResourceProfileEntity.java | 142 + .../entities/appcatalog/UserResourceProfilePK.java | 76 + .../appcatalog/UserStoragePreferenceEntity.java | 121 + .../appcatalog/UserStoragePreferencePK.java | 88 + .../core/entities/expcatalog/ExperimentEntity.java | 259 + .../entities/expcatalog/ExperimentErrorEntity.java | 134 + .../entities/expcatalog/ExperimentErrorPK.java | 75 + .../entities/expcatalog/ExperimentInputEntity.java | 207 + .../entities/expcatalog/ExperimentInputPK.java | 75 + .../expcatalog/ExperimentOutputEntity.java | 188 + .../entities/expcatalog/ExperimentOutputPK.java | 75 + .../expcatalog/ExperimentStatusEntity.java | 111 + .../entities/expcatalog/ExperimentStatusPK.java | 75 + .../expcatalog/ExperimentSummaryEntity.java | 158 + .../core/entities/expcatalog/GatewayEntity.java | 252 + .../entities/expcatalog/GatewayWorkerEntity.java | 61 + .../core/entities/expcatalog/GatewayWorkerPK.java | 75 + .../core/entities/expcatalog/JobEntity.java | 190 + .../registry/core/entities/expcatalog/JobPK.java | 76 + .../core/entities/expcatalog/JobStatusEntity.java | 123 + .../core/entities/expcatalog/JobStatusPK.java | 87 + .../entities/expcatalog/NotificationEntity.java | 129 + .../core/entities/expcatalog/ProcessEntity.java} | 302 +- .../entities/expcatalog/ProcessErrorEntity.java | 133 + .../core/entities/expcatalog/ProcessErrorPK.java | 75 + .../entities/expcatalog/ProcessInputEntity.java | 209 + .../core/entities/expcatalog/ProcessInputPK.java | 75 + .../entities/expcatalog/ProcessOutputEntity.java | 187 + .../core/entities/expcatalog/ProcessOutputPK.java | 75 + .../expcatalog/ProcessResourceScheduleEntity.java | 137 + .../entities/expcatalog/ProcessStatusEntity.java | 111 + .../core/entities/expcatalog/ProcessStatusPK.java | 75 + .../core/entities/expcatalog/ProjectEntity.java | 106 + .../entities/expcatalog/ProjectUserEntity.java | 61 + .../core/entities/expcatalog/ProjectUserPK.java | 75 + .../entities/expcatalog/QueueStatusEntity.java | 109 + .../core/entities/expcatalog/QueueStatusPK.java | 89 + .../core/entities/expcatalog/TaskEntity.java | 170 + .../core/entities/expcatalog/TaskErrorEntity.java | 133 + .../core/entities/expcatalog/TaskErrorPK.java | 75 + .../core/entities/expcatalog/TaskStatusEntity.java | 111 + .../core/entities/expcatalog/TaskStatusPK.java | 75 + .../expcatalog/UserConfigurationDataEntity.java | 291 + .../replicacatalog/ConfigurationEntity.java | 59 + .../entities/replicacatalog/ConfigurationPK.java | 76 + .../entities/replicacatalog/DataProductEntity.java | 173 + .../replicacatalog/DataProductMetadataEntity.java | 70 + .../replicacatalog/DataProductMetadataPK.java | 76 + .../replicacatalog/DataReplicaLocationEntity.java | 188 + .../replicacatalog/DataReplicaMetadataEntity.java | 70 + .../replicacatalog/DataReplicaMetadataPK.java | 74 + .../workflowcatalog/ComponentStatusEntity.java | 97 + .../core/entities/workflowcatalog/EdgeEntity.java | 108 + .../core/entities/workflowcatalog/EdgePK.java | 75 + .../core/entities/workflowcatalog/NodeEntity.java | 130 + .../core/entities/workflowcatalog/NodePK.java | 75 + .../core/entities/workflowcatalog/PortEntity.java | 109 + .../core/entities/workflowcatalog/PortPK.java | 76 + .../entities/workflowcatalog/WorkflowEntity.java | 169 + .../workflowcatalog/WorkflowInputEntity.java | 183 + .../entities/workflowcatalog/WorkflowInputPK.java | 79 + .../workflowcatalog/WorkflowOutputEntity.java | 173 + .../entities/workflowcatalog/WorkflowOutputPK.java | 76 + .../workflowcatalog/WorkflowStatusEntity.java | 95 + .../entities/workflowcatalog/WorkflowStatusPK.java | 75 + .../workspacecatalog/NSFDemographicsEntity.java | 94 + .../workspacecatalog/UserProfileEntity.java | 247 + .../core/repositories/AbstractRepository.java | 135 + .../appcatalog/AppCatAbstractRepository.java | 46 + .../ApplicationDeploymentRepository.java | 235 + .../appcatalog/ApplicationInputRepository.java | 32 + .../appcatalog/ApplicationInterfaceRepository.java | 287 + .../appcatalog/ApplicationModuleRepository.java | 31 + .../appcatalog/ApplicationOutputRepository.java | 32 + .../appcatalog/BatchQueuePolicyRepository.java | 34 + .../appcatalog/BatchQueueRepository.java | 31 + .../ComputeResourcePolicyRepository.java | 33 + .../appcatalog/ComputeResourcePrefRepository.java | 51 + .../appcatalog/ComputeResourceRepository.java | 503 + .../appcatalog/DataMovementRepository.java | 44 + .../appcatalog/GatewayGroupsRepository.java | 30 + .../appcatalog/GroupResourceProfileRepository.java | 183 + .../appcatalog/GrpComputePrefRepository.java | 64 + .../appcatalog/GwyResourceProfileRepository.java | 201 + .../JobSubmissionInterfaceRepository.java | 47 + .../appcatalog/ResourceJobManagerRepository.java | 106 + .../appcatalog/StoragePrefRepository.java | 31 + .../appcatalog/StorageResourceRepository.java | 210 + .../UserComputeResourcePreferenceRepository.java | 34 + .../appcatalog/UserResourceProfileRepository.java | 207 + .../UserStoragePreferenceRepository.java | 34 + .../expcatalog/ExpCatAbstractRepository.java | 23 + .../expcatalog/ExperimentErrorRepository.java | 76 + .../expcatalog/ExperimentInputRepository.java | 71 + .../expcatalog/ExperimentOutputRepository.java | 73 + .../expcatalog/ExperimentRepository.java | 202 + .../expcatalog/ExperimentStatusRepository.java | 117 + .../expcatalog/ExperimentSummaryRepository.java | 291 + .../repositories/expcatalog/GatewayRepository.java | 106 + .../repositories/expcatalog/JobRepository.java | 152 + .../expcatalog/JobStatusRepository.java | 107 + .../expcatalog/NotificationRepository.java | 104 + .../expcatalog/ProcessErrorRepository.java | 74 + .../expcatalog/ProcessInputRepository.java | 71 + .../expcatalog/ProcessOutputRepository.java | 71 + .../repositories/expcatalog/ProcessRepository.java | 187 + .../expcatalog/ProcessStatusRepository.java | 113 + .../repositories/expcatalog/ProjectRepository.java | 202 + .../expcatalog/QueueStatusRepository.java | 55 + .../expcatalog/TaskErrorRepository.java | 54 + .../repositories/expcatalog/TaskRepository.java | 158 + .../expcatalog/TaskStatusRepository.java | 79 + .../replicacatalog/DataProductRepository.java | 150 + .../DataReplicaLocationRepository.java | 97 + .../replicacatalog/RepCatAbstractRepository.java | 43 + .../WorkflowCatAbstractRepository.java | 43 + .../workflowcatalog/WorkflowRepository.java | 155 + .../registry/core/utils/AppCatalogUtils.java | 25 +- .../airavata/registry/core/utils/Committer.java | 21 +- .../airavata/registry/core/utils/DBConstants.java | 169 + .../utils/DozerConverter/StorageDateConverter.java | 54 + .../registry/core/utils/ExpCatalogUtils.java | 25 +- .../core/utils/JPAUtil/AppCatalogJPAUtils.java | 90 + .../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 84 + .../core/utils/JPAUtil/RepCatalogJPAUtils.java | 80 + .../utils/JPAUtil/WorkflowCatalogJPAUtils.java | 80 + .../airavata/registry/core/utils/JPAUtils.java | 82 + .../registry/core/utils/ObjectMapperSingleton.java | 84 + .../registry/core/utils/QueryConstants.java | 170 + .../registry/core/utils/WorkflowCatalogUtils.java | 25 +- .../src/main/resources/META-INF/persistence.xml | 121 + .../src/main/resources/appcatalog-derby.sql} | 279 +- .../src/main/resources/appcatalog-mysql.sql | 80 +- .../src/main/resources/dozer_mapping.xml | 26 + .../src/main/resources/expcatalog-derby.sql | 398 + .../src/main/resources/expcatalog-mysql.sql | 401 + .../src/main/resources/replicacatalog-derby.sql | 77 + .../src/main/resources/replicacatalog-mysql.sql | 76 + .../src/main/resources/workflowcatalog-derby.sql | 128 + .../src/main/resources/workflowcatalog-mysql.sql | 128 + .../ApplicationDeploymentRepositoryTest.java | 322 + .../ApplicationInterfaceRepositoryTest.java | 485 + .../appcatalog/ComputeResourceRepositoryTest.java | 635 + .../appcatalog/GatewayGroupsRepositoryTest.java | 93 + .../appcatalog/GatewayProfileRepositoryTest.java | 135 + .../GroupResourceProfileRepositoryTest.java | 212 + .../appcatalog/GrpComputePrefRepositoryTest.java | 440 + .../appcatalog/StorageResourceRepositoryTest.java | 141 + .../UserResourceProfileRepositoryTest.java | 83 + .../core/repositories/common/DerbyDBManager.java | 239 + .../core/repositories/common/JdbcUtil.java | 357 + .../core/repositories/common/TestBase.java | 78 + .../expcatalog/ExperimentErrorRepositoryTest.java | 99 + .../expcatalog/ExperimentInputRepositoryTest.java | 105 + .../expcatalog/ExperimentOutputRepositoryTest.java | 105 + .../expcatalog/ExperimentRepositoryTest.java | 140 + .../expcatalog/ExperimentStatusRepositoryTest.java | 103 + .../ExperimentSummaryRepositoryTest.java | 198 + .../expcatalog/GatewayRepositoryTest.java | 73 + .../repositories/expcatalog/JobRepositoryTest.java | 142 + .../expcatalog/JobStatusRepositoryTest.java | 134 + .../expcatalog/NotificationRepositoryTest.java | 68 + .../expcatalog/ProcessErrorRepositoryTest.java | 106 + .../expcatalog/ProcessInputRepositoryTest.java | 111 + .../expcatalog/ProcessOutputRepositoryTest.java | 112 + .../expcatalog/ProcessRepositoryTest.java | 147 + .../expcatalog/ProcessStatusRepositoryTest.java | 125 + .../expcatalog/ProjectRepositoryTest.java | 95 + .../expcatalog/QueueStatusRepositoryTest.java | 63 + .../expcatalog/TaskErrorRepositoryTest.java | 117 + .../expcatalog/TaskRepositoryTest.java | 126 + .../expcatalog/TaskStatusRepositoryTest.java | 94 + .../repositories/expcatalog/util/Initialize.java | 293 + .../replicacatalog/DataProductRepositoryTest.java | 155 + .../DataReplicaLocationRepositoryTest.java | 124 + .../replicacatalog/util/Initialize.java | 313 + .../workflowcatalog/WorkflowRepositoryTest.java | 111 + .../workflowcatalog/util/Initialize.java | 313 + .../src/test/resources/appcatalog-derby.sql} | 306 +- .../src/test/resources/expcatalog-derby.sql | 399 + .../src/test/resources/logback.xml | 31 + .../src/test/resources/replicacatalog-derby.sql | 77 + .../src/test/resources/workflowcatalog-derby.sql | 128 + modules/registry/registry-core/pom.xml | 6 +- .../catalog/impl/ApplicationDeploymentImpl.java | 27 +- .../app/catalog/impl/ApplicationInterfaceImpl.java | 19 + .../app/catalog/impl/UsrResourceProfileImpl.java | 6 +- .../catalog/resources/AppCatAbstractResource.java | 1 + .../catalog/resources/AppDeploymentResource.java | 20 +- .../app/catalog/resources/AppModuleResource.java | 33 +- .../resources/UserResourceProfileResource.java | 2 +- .../app/catalog/util/AppCatalogQueryGenerator.java | 8 +- .../catalog/util/AppCatalogThriftConversion.java | 6 - .../catalog/impl/ExperimentRegistry.java | 3 + .../core/experiment/catalog/model/Process.java | 10 + .../catalog/model/UserConfigurationData.java | 10 + .../catalog/resources/ProcessResource.java | 10 + .../resources/UserConfigurationDataResource.java | 10 + .../core/experiment/catalog/resources/Utils.java | 2 + .../catalog/utils/ThriftDataModelConversion.java | 2 + .../replica/catalog/impl/ReplicaCatalogImpl.java | 4 +- .../catalog/utils/ReplicaCatalogConstants.java | 6 +- .../src/main/resources/appcatalog-mysql.sql | 2 +- .../src/main/resources/expcatalog-derby.sql | 2 + .../src/main/resources/expcatalog-mysql.sql | 2 + .../airavata/app/catalog/AppDeploymentTest.java | 10 +- .../app/catalog/AppModuleResourceTest.java | 119 + .../app/catalog/UserResourceProfileTest.java | 7 +- .../registry/cpi/ApplicationDeployment.java | 26 +- .../registry/cpi/ApplicationInterface.java | 14 + .../registry/cpi/DataProductInterface.java | 28 + .../registry/cpi/DataReplicaLocationInterface.java | 19 + .../airavata/registry/cpi/ReplicaCatalog.java | 17 +- .../airavata/registry/cpi/UsrResourceProfile.java | 59 +- .../registry-server/registry-api-service/pom.xml | 5 + .../api/service/handler/RegistryServerHandler.java | 1348 +- .../airavata/registry/api/RegistryService.java | 99496 +++++++++------ .../DeltaScripts/appCatalog_schema_delta.sql | 38 +- .../DeltaScripts/credentialStore_schema_delta.sql | 8 - .../DeltaScripts/expCatalog_schema_delta.sql | 8 - .../DeltaScripts/replicaCatalog_schema_delta.sql | 8 - .../DeltaScripts/sharingCatalog_schema_delta.sql | 21 + .../DeltaScripts/workFlow_schema_delta.sql | 8 - ...licaCatalog_lowercase_user_data_dir_example.sql | 0 .../credentialStore_keycloak_migration.sql | 0 .../expCatalog_keycloak_migration.sql | 0 .../profileService_keycloak_migration.sql | 0 .../sharingCatalog_keycloak_migration.sql | 0 .../0.16-0.17/migration-notes.md | 9 +- .../0.17-0.18/migration-notes.md | 17 - .../DeltaScripts/appCatalog_schema_delta.sql | 36 - .../next/DeltaScripts/appCatalog_schema_delta.sql | 40 + .../experimentCatalog_schema_delta.sql} | 18 +- .../sharing-data-migrator/README.md | 9 + .../sharing-registry/sharing-data-migrator/pom.xml | 68 +- .../migrator/airavata/AiravataDataMigrator.java | 395 +- .../migrator/airavata/ConnectionFactory.java | 23 +- .../src/main/resources/.gitignore | 1 + .../resources/airavata-server.properties.sample | 66 + .../sharing-registry-distribution/pom.xml | 4 +- .../sharing-registry-server/pom.xml | 13 +- .../registry/db/entities/GroupAdminEntity.java | 14 + .../registry/db/entities/UserGroupEntity.java | 12 + .../db/repositories/AbstractRepository.java | 7 +- .../db/repositories/GroupMembershipRepository.java | 4 +- .../messaging/SharingServiceDBEventHandler.java | 38 +- .../server/SharingRegistryServerHandler.java | 32 +- .../registry/utils/ThriftDataModelConversion.java | 1 + .../registry/SharingRegistryServerHandlerTest.java | 60 +- .../registry/SharingRegistryServiceTest.java | 36 +- .../sharing/registry/models/GroupAdmin.java | 4 +- .../sharing/registry/models/UserGroup.java | 169 +- .../service/cpi/SharingRegistryService.java | 556 +- .../sharing-service-docs/api-docs/sharing_cpi.html | 224 +- .../api-docs/sharing_models.html | 70 +- .../thrift_models/sharing_cpi.thrift | 8 +- .../thrift_models/sharing_models.thrift | 4 +- .../client/UserProfileServiceClientFactory.java | 43 - pom.xml | 42 + .../airavata-apis/airavata_api.thrift | 207 +- .../component-cpis/generate-cpi-stubs.sh | 2 +- .../component-cpis/registry-api.thrift | 138 + .../data-models/airavata_data_models.thrift | 1 + .../experiment_model.thrift | 1 + .../experiment-catalog-models/process_model.thrift | 3 +- .../experiment-catalog-models/status_models.thrift | 12 +- .../data_movement_models.thrift | 3 + ...g_models.thrift => gateway_groups_model.thrift} | 15 +- .../group_resource_profile_model.thrift | 104 + .../resource_catalog_models.thrift | 3 +- .../storage_resource_model.thrift | 2 + .../user_resource_profile_model.thrift | 4 - .../group_manager_model.thrift | 4 +- .../group-manager/group-manager-cpi.thrift | 12 + .../iam-admin-services-cpi.thrift | 5 + 488 files changed, 223216 insertions(+), 97528 deletions(-)
