Merge branch 'prep-master-merge'

Merging develop to master


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

Branch: refs/heads/develop
Commit: 21a750580e9e59f8c66cb6bae13de9f3ffde4e1b
Parents: 983225c 36edde6
Author: Marcus Christie <machris...@apache.org>
Authored: Thu Aug 3 11:59:32 2017 -0400
Committer: Marcus Christie <machris...@apache.org>
Committed: Thu Aug 3 11:59:32 2017 -0400

----------------------------------------------------------------------
 README                                          |     3 -
 airavata-api/airavata-api-server/pom.xml        |    15 +
 .../airavata/api/server/AiravataAPIServer.java  |     8 +-
 .../server/handler/AiravataServerHandler.java   |    91 +-
 .../security/AiravataSecurityManager.java       |    42 -
 .../DefaultAiravataSecurityManager.java         |   272 -
 .../api/server/security/IdentityContext.java    |    42 -
 .../airavata/api/server/security/Main.java      |   178 -
 .../server/security/SecurityManagerFactory.java |    59 -
 .../server/security/authzcache/AuthzCache.java  |    60 -
 .../security/authzcache/AuthzCacheEntry.java    |    62 -
 .../security/authzcache/AuthzCacheIndex.java    |    89 -
 .../security/authzcache/AuthzCacheManager.java  |    79 -
 .../authzcache/AuthzCacheManagerFactory.java    |    59 -
 .../security/authzcache/AuthzCachedStatus.java  |    33 -
 .../authzcache/DefaultAuthzCacheManager.java    |   105 -
 .../security/interceptor/SecurityCheck.java     |    35 -
 .../interceptor/SecurityInterceptor.java        |    82 -
 .../security/interceptor/SecurityModule.java    |    42 -
 .../security/oauth/DefaultOAuthClient.java      |    90 -
 .../server/security/xacml/DefaultPAPClient.java |   124 -
 .../server/security/xacml/DefaultXACMLPEP.java  |   132 -
 .../java/org/apache/airavata/api/Airavata.java  |   370 +-
 .../airavata/api/airavata_apiConstants.java     |    28 +-
 .../main/resources/lib/airavata/Airavata.cpp    |   104 +-
 .../src/main/resources/lib/airavata/Airavata.h  |    82 +-
 .../lib/airavata/Airavata_server.skeleton.cpp   |     6 +-
 .../resources/lib/airavata/airavata_api_types.h |     1 +
 .../lib/airavata/airavata_data_models_types.h   |     2 +
 .../lib/airavata/airavata_errors_types.cpp      |   205 +-
 .../lib/airavata/airavata_errors_types.h        |    44 +
 .../application_deployment_model_types.cpp      |    24 +-
 .../application_deployment_model_types.h        |    12 +-
 .../airavata/compute_resource_model_types.cpp   |   134 +-
 .../lib/airavata/compute_resource_model_types.h |    56 +-
 .../lib/airavata/db_event_model_constants.cpp   |    34 +
 .../lib/airavata/db_event_model_constants.h     |    41 +
 .../lib/airavata/db_event_model_types.cpp       |   627 +
 .../lib/airavata/db_event_model_types.h         |   318 +
 .../lib/airavata/messaging_events_types.cpp     |     8 +-
 .../lib/airavata/messaging_events_types.h       |     3 +-
 .../airavata/replica_catalog_models_types.cpp   |   726 +-
 .../lib/airavata/replica_catalog_models_types.h |   274 +-
 .../airavata/tenant_profile_model_constants.cpp |    34 +
 .../airavata/tenant_profile_model_constants.h   |    41 +
 .../lib/airavata/tenant_profile_model_types.cpp |   675 +
 .../lib/airavata/tenant_profile_model_types.h   |   329 +
 .../lib/airavata/user_profile_model_types.cpp   |   239 +-
 .../lib/airavata/user_profile_model_types.h     |    59 +-
 .../lib/airavata/workspace_model_types.cpp      |   106 +-
 .../lib/airavata/workspace_model_types.h        |    15 +-
 .../resources/lib/Airavata/API/Airavata.php     |    80 +-
 .../resources/lib/Airavata/API/Error/Types.php  |    82 +
 .../Model/AppCatalog/AppDeployment/Types.php    |    25 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |   142 +-
 .../lib/Airavata/Model/Application/Io/Types.php |     6 +-
 .../lib/Airavata/Model/Data/Replica/Types.php   |   572 +-
 .../lib/Airavata/Model/Dbevent/Types.php        |   573 +
 .../Airavata/Model/Messaging/Event/Types.php    |     2 +
 .../lib/Airavata/Model/Tenant/Types.php         |   634 +
 .../resources/lib/Airavata/Model/User/Types.php |   279 +-
 .../lib/Airavata/Model/Workspace/Types.php      |   135 +-
 .../Iam/Admin/Services/CPI/Error/Types.php      |    95 +
 .../Iam/Admin/Services/CPI/IamAdminServices.php |  3196 ++++
 .../Service/Iam/Admin/Services/CPI/Types.php    |    33 +
 .../Service/Profile/Tenant/CPI/Error/Types.php  |    95 +
 .../Profile/Tenant/CPI/TenantProfileService.php |  2437 ++++
 .../Service/Profile/Tenant/CPI/Types.php        |    33 +
 .../lib/Airavata/Service/Profile/Types.php      |    20 +
 .../Service/Profile/User/CPI/Error/Types.php    |    95 +
 .../Airavata/Service/Profile/User/CPI/Types.php |    33 +
 .../Profile/User/CPI/UserProfileService.php     |  2025 +++
 .../lib/apache/airavata/api/Airavata-remote     |    18 +-
 .../lib/apache/airavata/api/Airavata.py         |    70 +-
 .../lib/apache/airavata/api/error/ttypes.py     |    76 +
 .../resources/lib/apache/airavata/api/ttypes.py |     1 +
 .../model/appcatalog/appdeployment/ttypes.py    |    19 +-
 .../model/appcatalog/computeresource/ttypes.py  |    86 +-
 .../airavata/model/data/replica/ttypes.py       |   430 +-
 .../apache/airavata/model/dbevent/__init__.py   |     1 +
 .../apache/airavata/model/dbevent/constants.py  |    11 +
 .../lib/apache/airavata/model/dbevent/ttypes.py |   494 +
 .../airavata/model/messaging/event/ttypes.py    |     3 +
 .../apache/airavata/model/tenant/__init__.py    |     1 +
 .../apache/airavata/model/tenant/constants.py   |    11 +
 .../lib/apache/airavata/model/tenant/ttypes.py  |   488 +
 .../lib/apache/airavata/model/ttypes.py         |     2 +
 .../lib/apache/airavata/model/user/ttypes.py    |   231 +-
 .../apache/airavata/model/workspace/ttypes.py   |   130 +-
 .../apache/airavata/model/ComponentState.java   |    28 +-
 .../apache/airavata/model/ComponentStatus.java  |    28 +-
 .../org/apache/airavata/model/EdgeModel.java    |    28 +-
 .../org/apache/airavata/model/NodeModel.java    |    28 +-
 .../org/apache/airavata/model/PortModel.java    |    28 +-
 .../apache/airavata/model/WorkflowModel.java    |    28 +-
 .../apache/airavata/model/WorkflowState.java    |    28 +-
 .../apache/airavata/model/WorkflowStatus.java   |    28 +-
 .../ApplicationDeploymentDescription.java       |   145 +-
 .../appdeployment/ApplicationModule.java        |    28 +-
 .../appcatalog/appdeployment/CommandObject.java |    28 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |    28 +-
 .../ApplicationInterfaceDescription.java        |    28 +-
 .../appcatalog/computeresource/BatchQueue.java  |   251 +-
 .../computeresource/CloudJobSubmission.java     |    28 +-
 .../ComputeResourceDescription.java             |   432 +-
 .../appcatalog/computeresource/DMType.java      |    28 +-
 .../appcatalog/computeresource/FileSystems.java |    28 +-
 .../computeresource/GlobusJobSubmission.java    |    28 +-
 .../computeresource/JobManagerCommand.java      |    28 +-
 .../computeresource/JobSubmissionInterface.java |    28 +-
 .../computeresource/JobSubmissionProtocol.java  |    28 +-
 .../computeresource/LOCALSubmission.java        |    28 +-
 .../appcatalog/computeresource/MonitorMode.java |    28 +-
 .../computeresource/ProviderName.java           |    28 +-
 .../computeresource/ResourceJobManager.java     |    28 +-
 .../computeresource/ResourceJobManagerType.java |    32 +-
 .../computeresource/SSHJobSubmission.java       |    28 +-
 .../computeresource/UnicoreJobSubmission.java   |    28 +-
 .../ComputeResourcePreference.java              |    28 +-
 .../gatewayprofile/GatewayResourceProfile.java  |    28 +-
 .../gatewayprofile/StoragePreference.java       |    28 +-
 .../StorageResourceDescription.java             |    28 +-
 .../UserComputeResourcePreference.java          |    28 +-
 .../UserResourceProfile.java                    |    28 +-
 .../UserStoragePreference.java                  |    28 +-
 .../airavata/model/application/io/DataType.java |    28 +-
 .../application/io/InputDataObjectType.java     |    91 +-
 .../application/io/OutputDataObjectType.java    |    28 +-
 .../airavata/model/commons/ErrorModel.java      |    28 +-
 .../model/commons/ValidationResults.java        |    28 +-
 .../airavata/model/commons/ValidatorResult.java |    28 +-
 .../commons/airavata_commonsConstants.java      |    28 +-
 .../credential/store/CertificateCredential.java |    28 +-
 .../model/credential/store/CommunityUser.java   |    28 +-
 .../credential/store/CredentialOwnerType.java   |    28 +-
 .../credential/store/CredentialSummary.java     |    28 +-
 .../credential/store/PasswordCredential.java    |    28 +-
 .../model/credential/store/SSHCredential.java   |    28 +-
 .../model/credential/store/SummaryType.java     |    28 +-
 .../credential_store_data_modelsConstants.java  |    28 +-
 .../airavata/model/data/movement/DMType.java    |    28 +-
 .../data/movement/DataMovementInterface.java    |    28 +-
 .../data/movement/DataMovementProtocol.java     |    28 +-
 .../data/movement/GridFTPDataMovement.java      |    28 +-
 .../model/data/movement/LOCALDataMovement.java  |    28 +-
 .../model/data/movement/SCPDataMovement.java    |    28 +-
 .../model/data/movement/SecurityProtocol.java   |    28 +-
 .../data/movement/UnicoreDataMovement.java      |    28 +-
 .../model/data/replica/DataProductModel.java    |   112 +-
 .../model/data/replica/DataProductType.java     |    28 +-
 .../data/replica/DataReplicaLocationModel.java  |    72 +-
 .../data/replica/ReplicaLocationCategory.java   |    28 +-
 .../data/replica/ReplicaPersistentType.java     |    28 +-
 .../apache/airavata/model/dbevent/CrudType.java |    68 +
 .../airavata/model/dbevent/DBEventMessage.java  |   622 +
 .../model/dbevent/DBEventMessageContext.java    |   387 +
 .../model/dbevent/DBEventPublisher.java         |   411 +
 .../model/dbevent/DBEventPublisherContext.java  |   641 +
 .../model/dbevent/DBEventSubscriber.java        |   406 +
 .../airavata/model/dbevent/DBEventType.java     |    62 +
 .../airavata/model/dbevent/EntityType.java      |    80 +
 .../model/error/AiravataClientException.java    |    28 +-
 .../airavata/model/error/AiravataErrorType.java |    28 +-
 .../model/error/AiravataSystemException.java    |    28 +-
 .../model/error/AuthenticationException.java    |    28 +-
 .../model/error/AuthorizationException.java     |    28 +-
 .../model/error/DuplicateEntryException.java    |   413 +
 .../error/ExperimentNotFoundException.java      |    28 +-
 .../model/error/InvalidRequestException.java    |    28 +-
 .../model/error/LaunchValidationException.java  |    28 +-
 .../model/error/ProjectNotFoundException.java   |    28 +-
 .../airavata/model/error/TimedOutException.java |    28 +-
 .../airavata/model/error/ValidationResults.java |    28 +-
 .../airavata/model/error/ValidatorResult.java   |    28 +-
 .../model/experiment/ExperimentModel.java       |    28 +-
 .../experiment/ExperimentSearchFields.java      |    28 +-
 .../model/experiment/ExperimentStatistics.java  |    28 +-
 .../experiment/ExperimentSummaryModel.java      |    28 +-
 .../model/experiment/ExperimentType.java        |    28 +-
 .../model/experiment/ProjectSearchFields.java   |    28 +-
 .../experiment/UserConfigurationDataModel.java  |    28 +-
 .../apache/airavata/model/group/GroupModel.java |    28 +-
 .../model/group/ResourcePermissionType.java     |    28 +-
 .../airavata/model/group/ResourceType.java      |    28 +-
 .../org/apache/airavata/model/job/JobModel.java |    28 +-
 .../event/ExperimentStatusChangeEvent.java      |    28 +-
 .../messaging/event/ExperimentSubmitEvent.java  |    28 +-
 .../model/messaging/event/JobIdentifier.java    |    28 +-
 .../messaging/event/JobStatusChangeEvent.java   |    28 +-
 .../event/JobStatusChangeRequestEvent.java      |    28 +-
 .../airavata/model/messaging/event/Message.java |    28 +-
 .../model/messaging/event/MessageLevel.java     |    28 +-
 .../model/messaging/event/MessageType.java      |    33 +-
 .../messaging/event/ProcessIdentifier.java      |    28 +-
 .../event/ProcessStatusChangeEvent.java         |    28 +-
 .../event/ProcessStatusChangeRequestEvent.java  |    28 +-
 .../messaging/event/ProcessSubmitEvent.java     |    28 +-
 .../messaging/event/ProcessTerminateEvent.java  |    28 +-
 .../model/messaging/event/TaskIdentifier.java   |    28 +-
 .../messaging/event/TaskOutputChangeEvent.java  |    28 +-
 .../messaging/event/TaskStatusChangeEvent.java  |    28 +-
 .../event/TaskStatusChangeRequestEvent.java     |    28 +-
 .../parallelism/ApplicationParallelismType.java |    28 +-
 .../airavata/model/process/ProcessModel.java    |    28 +-
 .../ComputationalResourceSchedulingModel.java   |    28 +-
 .../airavata/model/security/AuthzToken.java     |    28 +-
 .../airavata/model/status/ExperimentState.java  |    28 +-
 .../airavata/model/status/ExperimentStatus.java |    28 +-
 .../apache/airavata/model/status/JobState.java  |    28 +-
 .../apache/airavata/model/status/JobStatus.java |    28 +-
 .../airavata/model/status/ProcessState.java     |    28 +-
 .../airavata/model/status/ProcessStatus.java    |    28 +-
 .../airavata/model/status/QueueStatusModel.java |    28 +-
 .../apache/airavata/model/status/TaskState.java |    28 +-
 .../airavata/model/status/TaskStatus.java       |    28 +-
 .../airavata/model/task/DataStageType.java      |    28 +-
 .../model/task/DataStagingTaskModel.java        |    28 +-
 .../model/task/EnvironmentSetupTaskModel.java   |    28 +-
 .../model/task/JobSubmissionTaskModel.java      |    28 +-
 .../airavata/model/task/MonitorTaskModel.java   |    28 +-
 .../apache/airavata/model/task/TaskModel.java   |    28 +-
 .../apache/airavata/model/task/TaskTypes.java   |    28 +-
 .../apache/airavata/model/tenant/Tenant.java    |  1580 ++
 .../model/tenant/TenantApprovalStatus.java      |    80 +
 .../airavata/model/user/NSFDemographics.java    |   177 +-
 .../org/apache/airavata/model/user/Status.java  |    28 +-
 .../airavata/model/user/USCitizenship.java      |    28 +-
 .../apache/airavata/model/user/UserProfile.java |   910 +-
 .../apache/airavata/model/user/disability.java  |    28 +-
 .../apache/airavata/model/user/ethnicity.java   |    28 +-
 .../org/apache/airavata/model/user/race.java    |    28 +-
 .../model/user/user_profile_modelConstants.java |    28 +-
 .../airavata/model/workspace/Gateway.java       |   358 +-
 .../model/workspace/GatewayApprovalStatus.java  |    33 +-
 .../apache/airavata/model/workspace/Group.java  |    28 +-
 .../airavata/model/workspace/Notification.java  |    28 +-
 .../model/workspace/NotificationPriority.java   |    28 +-
 .../airavata/model/workspace/Project.java       |    28 +-
 .../apache/airavata/model/workspace/User.java   |    28 +-
 airavata-services/pom.xml                       |    70 +
 .../iam-admin-services-core/pom.xml             |    67 +
 .../core/impl/TenantManagementKeycloakImpl.java |   604 +
 .../interfaces/TenantManagementInterface.java   |   149 +
 .../services/core/tests/SetupNewGateway.java    |   117 +
 airavata-services/profile-service/pom.xml       |    39 +
 .../java-client-samples/pom.xml                 |    37 +
 .../client/samples/TenantProfileSample.java     |    61 +
 .../client/samples/UserProfileSample.java       |   124 +
 .../client/util/ProfileServiceClientUtil.java   |    47 +
 .../resources/profile-client-sample.properties  |    29 +
 .../profile-service-client-sdks/pom.xml         |    34 +
 .../profile-service-commons/pom.xml             |   117 +
 .../repositories/AbstractRepository.java        |   124 +
 .../commons/tenant/entities/GatewayEntity.java  |   286 +
 .../user/entities/NSFDemographicsEntity.java    |   108 +
 .../user/entities/UserProfileEntity.java        |   334 +
 .../profile/commons/utils/Committer.java        |    27 +
 .../profile/commons/utils/JPAConstants.java     |    34 +
 .../service/profile/commons/utils/JPAUtils.java |    79 +
 .../commons/utils/ObjectMapperSingleton.java    |    39 +
 .../profile/commons/utils/QueryConstants.java   |    33 +
 .../service/profile/commons/utils/Utils.java    |   147 +
 .../src/main/resources/META-INF/persistence.xml |    35 +
 .../profile-service-server/pom.xml              |    59 +
 .../handlers/IamAdminServicesHandler.java       |   261 +
 .../handlers/TenantProfileServiceHandler.java   |   226 +
 .../handlers/UserProfileServiceHandler.java     |   208 +
 .../profile/server/ProfileServiceServer.java    |   181 +
 .../profile/utils/ProfileServiceUtils.java      |    70 +
 .../profile-service-stubs/pom.xml               |    37 +
 .../client/ProfileServiceClientFactory.java     |    78 +
 .../admin/services/cpi/IamAdminServices.java    | 12835 +++++++++++++++++
 .../exception/IamAdminServicesException.java    |   407 +
 .../cpi/iam_admin_services_cpiConstants.java    |    59 +
 .../tenant/cpi/TenantProfileService.java        |  9718 +++++++++++++
 .../TenantProfileServiceException.java          |   407 +
 .../tenant/cpi/profile_tenant_cpiConstants.java |    59 +
 .../profile/user/cpi/UserProfileService.java    |  7894 ++++++++++
 .../exception/UserProfileServiceException.java  |   407 +
 .../user/cpi/profile_user_cpiConstants.java     |    59 +
 .../profile-service/profile-tenant-core/pom.xml |    40 +
 .../repositories/TenantProfileRepository.java   |   105 +
 .../profile-service/profile-user-core/pom.xml   |    85 +
 .../UserProfileRegistryException.java           |    28 +
 .../repositories/UserProfileRepository.java     |   118 +
 .../src/main/resources/user_profile_catalog.sql |    84 +
 .../repositories/WorkspaceRepositoryTest.java   |   176 +
 airavata-services/services-security/pom.xml     |    92 +
 .../security/AiravataSecurityManager.java       |    43 +
 .../DefaultAiravataSecurityManager.java         |   273 +
 .../service/security/IdentityContext.java       |    44 +
 .../security/KeyCloakSecurityManager.java       |   304 +
 .../apache/airavata/service/security/Main.java  |   179 +
 .../security/SecurityManagerFactory.java        |    60 +
 .../service/security/authzcache/AuthzCache.java |    61 +
 .../security/authzcache/AuthzCacheEntry.java    |    63 +
 .../security/authzcache/AuthzCacheIndex.java    |    90 +
 .../security/authzcache/AuthzCacheManager.java  |    80 +
 .../authzcache/AuthzCacheManagerFactory.java    |    60 +
 .../security/authzcache/AuthzCachedStatus.java  |    34 +
 .../authzcache/DefaultAuthzCacheManager.java    |   106 +
 .../security/interceptor/SecurityCheck.java     |    37 +
 .../interceptor/SecurityInterceptor.java        |    83 +
 .../security/interceptor/SecurityModule.java    |    43 +
 .../security/oauth/DefaultOAuthClient.java      |    91 +
 .../security/xacml/DefaultPAPClient.java        |   125 +
 .../service/security/xacml/DefaultXACMLPEP.java |   133 +
 dev-tools/ansible/README.md                     |     1 +
 dev-tools/ansible/airavata-iam-setup.yml        |     8 +
 dev-tools/ansible/apiserver.yml                 |    34 +
 dev-tools/ansible/database.yml                  |    11 +
 .../inventories/airavata-iam/group_vars/all.yml |    16 +
 .../ansible/inventories/airavata-iam/hosts      |     8 +
 .../inventories/develop/group_vars/all.yml      |     9 +
 dev-tools/ansible/inventories/develop/hosts     |     2 +-
 .../PICKSC-Production/group_vars/pga/vars.yml   |    75 +
 .../PICKSC-Production/group_vars/pga/vault.yml  |    18 +
 .../inventories/scigap/PICKSC-Production/hosts  |    21 +
 .../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 +
 .../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   |    24 +-
 .../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     |    10 +-
 .../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 |    16 +-
 .../pga_config/georgiastate/vault.yml           |    34 +-
 .../production/pga_config/iugateway/vars.yml    |    14 +-
 .../production/pga_config/iugateway/vault.yml   |    34 +-
 .../scigap/production/pga_config/lsu/vars.yml   |    10 +-
 .../scigap/production/pga_config/lsu/vault.yml  |    34 +-
 .../pga_config/nanoconfinement/vars.yml         |    16 +-
 .../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   |    13 +-
 .../scigap/production/pga_config/nsg/vault.yml  |    34 +-
 .../production/pga_config/oiitandy/vars.yml     |    14 +-
 .../production/pga_config/oiitandy/vault.yml    |    34 +-
 .../scigap/production/pga_config/oscer/vars.yml |    14 +-
 .../production/pga_config/oscer/vault.yml       |    33 +-
 .../production/pga_config/phasta/vars.yml       |    14 +-
 .../production/pga_config/phasta/vault.yml      |    34 +-
 .../production/pga_config/scigap/vars.yml       |    23 +-
 .../production/pga_config/scigap/vault.yml      |    34 +-
 .../production/pga_config/seagrid/vars.yml      |    19 +-
 .../production/pga_config/seagrid/vault.yml     |    34 +-
 .../production/pga_config/simvascular/vars.yml  |    10 +-
 .../production/pga_config/simvascular/vault.yml |    34 +-
 .../production/pga_config/southdakota/vars.yml  |    14 +-
 .../production/pga_config/southdakota/vault.yml |    33 +-
 .../pga_config/southernillinois/vars.yml        |    20 +-
 .../pga_config/southernillinois/vault.yml       |    34 +-
 .../production/pga_config/testdrive/vars.yml    |    18 +-
 .../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  |    16 +-
 .../scigap/production/pga_config/utah/vault.yml |    34 +-
 .../testing-0.17-scigap/group_vars/all/vars.yml |     5 +
 .../testing-0.17-scigap/group_vars/pga/vars.yml |    18 +-
 .../group_vars/pga/vault.yml                    |    34 +-
 .../testing-0.17/files/client_truststore.jks    |   271 +
 .../testing-0.17/group_vars/all/vars.yml        |    15 +-
 .../testing-0.17/group_vars/all/vault.yml       |    18 +-
 .../testing-0.17/group_vars/pga/vars.yml        |    18 +-
 .../testing-0.17/group_vars/pga/vault.yml       |    34 +-
 dev-tools/ansible/keycloak.yml                  |     9 +
 dev-tools/ansible/pga-scigap-dev.yml            |    26 +
 dev-tools/ansible/pga-scigap-prod.yml           |     6 +-
 .../ansible/roles/api-orch/defaults/main.yml    |    10 +-
 dev-tools/ansible/roles/api-orch/tasks/main.yml |     2 +
 .../templates/airavata-server.properties.j2     |    40 +-
 .../ansible/roles/database/tasks/keycloak.yml   |    38 +
 dev-tools/ansible/roles/database/tasks/main.yml |     3 +
 dev-tools/ansible/roles/database/vars/main.yml  |     2 +
 dev-tools/ansible/roles/gfac/defaults/main.yml  |     2 +-
 .../templates/airavata-server.properties.j2     |    13 +-
 dev-tools/ansible/roles/java/tasks/main.yml     |     6 +
 dev-tools/ansible/roles/keycloak/README.md      |    14 +
 .../ansible/roles/keycloak/defaults/main.yml    |    21 +
 .../ansible/roles/keycloak/files/README.md      |    36 +
 dev-tools/ansible/roles/keycloak/tasks/main.yml |   185 +
 .../templates/keycloak-hacluster-init.j2        |    49 +
 .../templates/keycloak-standalone-init.j2       |    46 +
 .../ansible/roles/keycloak/templates/module.j2  |    12 +
 .../keycloak/templates/standalone-ha.xml.j2     |   533 +
 .../roles/keycloak/templates/standalone.xml.j2  |   493 +
 dev-tools/ansible/roles/pga/defaults/main.yml   |    11 +
 .../roles/pga/tasks/install_deps_CentOS_7.yml   |     1 +
 dev-tools/ansible/roles/pga/tasks/main.yml      |    11 +-
 .../roles/pga/templates/pga_config.php.j2       |    46 +-
 .../ansible/roles/zookeeper/tasks/main.yml      |     3 +
 modules/commons/pom.xml                         |     1 -
 .../common/utils/ApplicationSettings.java       |    16 +
 .../common/utils/DBEventManagerConstants.java   |    99 +
 .../airavata/common/utils/DBEventService.java   |    42 +
 .../airavata/common/utils/ServerSettings.java   |    32 +-
 .../src/main/resources/PBS_Groovy.template      |     1 +
 .../src/main/resources/SLURM_Groovy.template    |     1 +
 .../resources/airavata-default-xacml-policy.xml |    18 +-
 .../main/resources/airavata-server.properties   |    43 +-
 .../src/main/resources/client_truststore.jks    |   Bin 2423 -> 5312 bytes
 modules/db-event-manager/pom.xml                |    41 +
 .../db/event/manager/DBEventManagerRunner.java  |   143 +
 .../messaging/DBEventManagerException.java      |    42 +
 .../DBEventManagerMessagingFactory.java         |    76 +
 .../messaging/impl/DBEventMessageHandler.java   |   112 +
 .../db/event/manager/utils/Constants.java       |    33 +
 .../manager/utils/DbEventManagerZkUtils.java    |   126 +
 .../db-event-manager/src/test/java/Test.java    |    25 +
 modules/distribution/pom.xml                    |    84 +-
 .../apache/airavata/gfac/cpi/GfacService.java   |     2 +-
 .../apache/airavata/gfac/core/GFacUtils.java    |    75 +-
 .../org/apache/airavata/gfac/core/Script.java   |     1 +
 .../gfac/core/cluster/RemoteCluster.java        |     8 +-
 .../gfac/core/context/ProcessContext.java       |    26 +-
 .../airavata/gfac/impl/BESRemoteCluster.java    |     5 +-
 .../airavata/gfac/impl/HPCRemoteCluster.java    |    38 +-
 .../airavata/gfac/impl/LocalRemoteCluster.java  |     9 +-
 .../airavata/gfac/impl/task/ArchiveTask.java    |    14 +-
 .../gfac/impl/task/SCPDataStageTask.java        |   107 +-
 .../gfac/impl/task/utils/StreamData.java        |    22 +-
 .../monitor/email/parser/UGEEmailParser.java    |     4 +
 modules/messaging/core/pom.xml                  |     6 +-
 .../messaging/core/MessagingFactory.java        |    30 +-
 .../airavata/messaging/core/Publisher.java      |    10 +-
 .../messaging/core/impl/MessageConsumer.java    |    94 +
 .../messaging/core/impl/RabbitMQPublisher.java  |    37 +
 .../orchestrator/cpi/OrchestratorService.java   |     3 +-
 modules/registry-refactoring/pom.xml            |   153 -
 .../registry/core/RegistryException.java        |    27 -
 .../workspacecatalog/GatewayEntity.java         |   220 -
 .../workspacecatalog/NSFDemographicsEntity.java |    93 -
 .../workspacecatalog/NotificationEntity.java    |   109 -
 .../workspacecatalog/ProjectEntity.java         |    91 -
 .../workspacecatalog/UserProfileEntity.java     |   246 -
 .../core/repositories/AbstractRepository.java   |    97 -
 .../workspacecatalog/GatewayRepository.java     |    35 -
 .../NotificationRepository.java                 |    34 -
 .../workspacecatalog/ProjectRepository.java     |    34 -
 .../workspacecatalog/UserProfileRepository.java |    87 -
 .../airavata/registry/core/utils/Committer.java |    26 -
 .../registry/core/utils/JPAConstants.java       |    30 -
 .../airavata/registry/core/utils/JPAUtils.java  |    82 -
 .../core/utils/ObjectMapperSingleton.java       |    38 -
 .../registry/core/utils/QueryConstants.java     |    41 -
 .../airavata/registry/core/utils/Utils.java     |   155 -
 .../src/main/resources/META-INF/persistence.xml |    32 -
 .../src/main/resources/workspace_catalog.sql    |   125 -
 .../repositories/WorkspaceRepositoryTest.java   |   196 -
 .../catalog/impl/ApplicationDeploymentImpl.java |     2 +
 .../catalog/model/ApplicationDeployment.java    |    10 +
 .../core/app/catalog/model/BatchQueue.java      |    24 +-
 .../core/app/catalog/model/ComputeResource.java |    44 +
 .../resources/AppDeploymentResource.java        |    11 +
 .../catalog/resources/BatchQueueResource.java   |    20 +
 .../resources/ComputeResourceResource.java      |    42 +-
 .../app/catalog/util/AppCatalogJPAUtils.java    |    17 +-
 .../util/AppCatalogThriftConversion.java        |    13 +
 .../catalog/resources/WorkerResource.java       |    52 +-
 .../catalog/impl/ReplicaCatalogImpl.java        |    44 +
 .../src/main/resources/appcatalog-derby.sql     |     7 +
 .../src/main/resources/appcatalog-mysql.sql     |     7 +
 .../replica/catalog/ReplicaCatalogTest.java     |     2 +
 .../airavata/registry/cpi/ReplicaCatalog.java   |     3 +
 .../registry-api-service/pom.xml                |     5 +
 .../registry/api/service/RegistryAPIServer.java |    31 +
 .../service/handler/RegistryServerHandler.java  |    50 +-
 .../RegistryServiceDBEventHandler.java          |   164 +
 .../RegistryServiceDBEventMessagingFactory.java |    94 +
 .../registry/api/service/util/Constants.java    |    10 +
 .../api/service/util/DatabaseCreator.java       |    36 +-
 .../airavata/registry/api/RegistryService.java  |  8978 ++++++++----
 .../api/exception/RegistryServiceException.java |     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 +
 .../org/apache/airavata/server/ServerMain.java  |    12 +-
 .../sharing-registry-server/pom.xml             |     5 +
 .../db/repositories/AbstractRepository.java     |    12 +-
 .../db/repositories/EntityRepository.java       |     4 +-
 .../repositories/GroupMembershipRepository.java |    42 +-
 .../db/repositories/SharingRepository.java      |    50 +-
 .../db/repositories/UserGroupRepository.java    |    37 +-
 .../db/repositories/UserRepository.java         |    18 +-
 .../messaging/SharingServiceDBEventHandler.java |   248 +
 .../SharingServiceDBEventMessagingFactory.java  |   111 +
 .../registry/server/SharingRegistryServer.java  |    20 +
 .../server/SharingRegistryServerHandler.java    |   274 +-
 .../sharing/registry/utils/Constants.java       |    38 +
 .../utils/ThriftDataModelConversion.java        |    28 +
 .../main/resources/sharing-registry-derby.sql   |     2 +-
 .../main/resources/sharing-registry-mysql.sql   |     8 +-
 .../SharingRegistryServerHandlerTest.java       |     4 +
 .../registry/SharingRegistryServiceTest.java    |     6 +-
 .../sharing-registry-stubs/pom.xml              |     5 +
 .../SharingRegistryServiceClientFactory.java    |     1 +
 .../sharing/registry/models/Domain.java         |    19 -
 .../models/DuplicateEntryException.java         |   398 +
 .../sharing/registry/models/Entity.java         |    51 +-
 .../registry/models/EntitySearchField.java      |    19 -
 .../sharing/registry/models/EntityType.java     |    19 -
 .../registry/models/GroupCardinality.java       |    19 -
 .../sharing/registry/models/GroupChildType.java |    23 -
 .../registry/models/GroupMembership.java        |    19 -
 .../sharing/registry/models/GroupType.java      |    19 -
 .../sharing/registry/models/PermissionType.java |    19 -
 .../registry/models/SearchCondition.java        |    19 -
 .../sharing/registry/models/SearchCriteria.java |    19 -
 .../sharing/registry/models/Sharing.java        |    19 -
 .../models/SharingRegistryException.java        |    19 -
 .../sharing/registry/models/SharingType.java    |    19 -
 .../airavata/sharing/registry/models/User.java  |    19 -
 .../sharing/registry/models/UserGroup.java      |    19 -
 .../models/sharing_modelsConstants.java         |    19 -
 .../service/cpi/SharingRegistryService.java     |  2651 +++-
 .../sharing-service-docs/api-docs/index.html    |    23 +-
 .../api-docs/sharing_cpi.html                   |    36 +-
 .../api-docs/sharing_models.html                |    98 +-
 .../sharing-service-docs/api-docs/style.css     |    22 +-
 .../thrift_models/sharing_cpi.thrift            |    10 +-
 .../thrift_models/sharing_models.thrift         |    10 +
 .../thrift_models/thrift-gen.sh                 |     4 +-
 .../main/resources/airavata-server.properties   |    30 +-
 modules/user-profile-migration/.gitignore       |     1 +
 modules/user-profile-migration/pom.xml          |    71 +-
 .../apache/airavata/ISLoginCredentialsDAO.java  |    78 -
 .../apache/airavata/IdentityServerClient.java   |   137 -
 .../airavata/KeycloakIdentityServerClient.java  |   172 +
 .../org/apache/airavata/MigrationManager.java   |   312 +-
 .../UserProfileAiravataThriftClient.java        |    44 -
 .../org/apache/airavata/UserProfileDAO.java     |    18 +
 .../airavata/Wso2ISLoginCredentialsDAO.java     |    78 +
 .../airavata/Wso2IdentityServerClient.java      |   161 +
 .../user-profile-migration.properties.template  |    35 +
 modules/user-profile/pom.xml                    |    40 -
 .../user-profile/user-profile-service/pom.xml   |    50 -
 .../user/profile/server/UserProfileServer.java  |   157 -
 .../server/UserProfileServiceHandler.java       |   138 -
 modules/user-profile/user-profile-stubs/pom.xml |    74 -
 .../userprofile/cpi/UserProfileService.java     |  7523 ----------
 .../client/UserProfileServiceClientFactory.java |     3 +-
 .../exception/UserProfileServiceException.java  |   426 -
 .../cpi/user_profile_cpiConstants.java          |    76 -
 pom.xml                                         |     4 +-
 .../airavata-apis/airavata_api.thrift           |    10 +-
 .../airavata-apis/airavata_errors.thrift        |     9 +
 .../airavata-apis/db_event_model.thrift         |    81 +
 .../airavata-apis/messaging_events.thrift       |     3 +-
 .../component-cpis/generate-cpi-stubs.sh        |     2 +-
 .../component-cpis/registry-api.thrift          |    20 +-
 .../component-cpis/user-profile-cpi.thrift      |     2 +-
 .../data-models/airavata_data_models.thrift     |     6 +-
 .../application_deployment_model.thrift         |     3 +-
 .../workspace_model.thrift                      |    42 +-
 .../replica_catalog_models.thrift               |    31 +-
 .../compute_resource_model.thrift               |    10 +-
 .../user_resource_profile_model.thrift          |     2 +-
 .../group_manager_model.thrift                  |    48 -
 .../user-group-models/user_profile_model.thrift |   185 -
 .../group_manager_model.thrift                  |    48 +
 .../tenant_profile_model.thrift                 |    65 +
 .../user_profile_model.thrift                   |   196 +
 .../generate-thrift-stubs.sh                    |   108 +-
 .../service-cpis/generate-service-cpi-stubs.sh  |   195 +
 .../iam-admin-services-cpi.thrift               |    99 +
 .../iam_admin_services_cpi_errors.thrift        |    32 +
 .../profile-service/profile-service-cpi.thrift  |    34 +
 .../profile-tenant/profile-tenant-cpi.thrift    |    80 +
 .../profile_tenant_cpi_errors.thrift            |    32 +
 .../profile-user/profile-user-cpi.thrift        |    75 +
 .../profile-user/profile_user_cpi_errors.thrift |    32 +
 602 files changed, 79828 insertions(+), 22557 deletions(-)
----------------------------------------------------------------------


Reply via email to