You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2017/05/16 15:50:39 UTC
[50/50] [abbrv] airavata git commit: merging with develop
merging with develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a98d7fc3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a98d7fc3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a98d7fc3
Branch: refs/heads/registry-refactoring
Commit: a98d7fc35a9c656e33971920f15f634a23cf40a6
Parents: e43905c e988672
Author: Suresh Marru <sm...@apache.org>
Authored: Tue May 16 11:48:44 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue May 16 11:48:44 2017 -0400
----------------------------------------------------------------------
README | 3 -
airavata-api/airavata-api-server/pom.xml | 63 +-
.../airavata/api/server/AiravataAPIServer.java | 12 +-
.../api/server/AiravataDerbyServer.java | 4 +-
.../server/handler/AiravataServerHandler.java | 2573 +-
.../AiravataExperimentStatusUpdator.java | 6 +-
.../listener/ExperimentStatusChangedEvent.java | 19 +
.../security/AiravataSecurityManager.java | 43 -
.../DefaultAiravataSecurityManager.java | 273 -
.../api/server/security/IdentityContext.java | 44 -
.../airavata/api/server/security/Main.java | 179 -
.../server/security/SecurityManagerFactory.java | 60 -
.../server/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 | 36 -
.../interceptor/SecurityInterceptor.java | 83 -
.../security/interceptor/SecurityModule.java | 43 -
.../security/oauth/DefaultOAuthClient.java | 91 -
.../server/security/xacml/DefaultPAPClient.java | 125 -
.../server/security/xacml/DefaultXACMLPEP.java | 133 -
.../airavata/api/server/util/Constants.java | 4 +-
.../api/server/util/ThriftClientPool.java | 176 +
airavata-api/airavata-api-stubs/pom.xml | 38 +-
.../java/org/apache/airavata/api/Airavata.java | 112728 +++++++++++-----
.../airavata/api/airavata_apiConstants.java | 2 +-
.../api/client/AiravataClientFactory.java | 4 +-
.../airavata-cpp-sdk/pom.xml | 27 +-
.../src/main/assembly/bin-assembly.xml | 29 +-
.../main/resources/lib/airavata/Airavata.cpp | 68426 ++++++----
.../src/main/resources/lib/airavata/Airavata.h | 6687 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 591 +-
.../lib/airavata/airavata_api_constants.cpp | 2 +-
.../resources/lib/airavata/airavata_api_types.h | 3 +
.../lib/airavata/airavata_data_models_types.h | 3 +
.../lib/airavata/airavata_errors_types.cpp | 205 +-
.../lib/airavata/airavata_errors_types.h | 44 +
.../application_deployment_model_types.cpp | 110 +
.../application_deployment_model_types.h | 44 +-
.../airavata/application_io_models_types.cpp | 22 +
.../lib/airavata/application_io_models_types.h | 12 +-
.../airavata/compute_resource_model_types.cpp | 216 +-
.../lib/airavata/compute_resource_model_types.h | 94 +-
.../credential_store_data_models_constants.cpp | 36 +
.../credential_store_data_models_constants.h | 42 +
.../credential_store_data_models_types.cpp | 1149 +
.../credential_store_data_models_types.h | 494 +
.../airavata/credential_summary_constants.cpp | 34 +
.../lib/airavata/credential_summary_constants.h | 41 +
.../lib/airavata/credential_summary_types.cpp | 234 +
.../lib/airavata/credential_summary_types.h | 122 +
.../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/experiment_model_types.cpp | 22 +
.../lib/airavata/experiment_model_types.h | 12 +-
.../lib/airavata/group_manager_model_types.cpp | 8 +-
.../lib/airavata/group_manager_model_types.h | 3 +-
.../resources/lib/airavata/job_model_types.cpp | 30 +-
.../resources/lib/airavata/job_model_types.h | 12 +-
.../lib/airavata/messaging_events_types.cpp | 8 +-
.../lib/airavata/messaging_events_types.h | 3 +-
.../lib/airavata/process_model_types.cpp | 82 +-
.../lib/airavata/process_model_types.h | 32 +-
.../airavata/replica_catalog_models_types.cpp | 726 +-
.../lib/airavata/replica_catalog_models_types.h | 274 +-
.../lib/airavata/status_models_types.cpp | 201 +
.../lib/airavata/status_models_types.h | 67 +
.../resources/lib/airavata/task_model_types.cpp | 60 +-
.../resources/lib/airavata/task_model_types.h | 18 +-
.../airavata/tenant_profile_model_constants.cpp | 34 +
.../airavata/tenant_profile_model_constants.h | 41 +
.../lib/airavata/tenant_profile_model_types.cpp | 541 +
.../lib/airavata/tenant_profile_model_types.h | 244 +
.../lib/airavata/user_profile_model_types.cpp | 239 +-
.../lib/airavata/user_profile_model_types.h | 59 +-
.../user_resource_profile_model_constants.cpp | 34 +
.../user_resource_profile_model_constants.h | 41 +
.../user_resource_profile_model_types.cpp | 759 +
.../user_resource_profile_model_types.h | 334 +
.../airavata-php-sdk/pom.xml | 27 +-
.../src/main/assembly/bin-assembly.xml | 29 +-
.../conf/airavata-client-properties.ini | 47 +-
.../resources/conf/app-catalog-identifiers.ini | 40 +-
.../resources/lib/Airavata/API/Airavata.php | 25101 +++-
.../resources/lib/Airavata/API/Error/Types.php | 82 +
.../main/resources/lib/Airavata/API/Types.php | 2 +-
.../Model/AppCatalog/AppDeployment/Types.php | 115 +
.../Model/AppCatalog/ComputeResource/Types.php | 204 +-
.../AppCatalog/UserResourceProfile/Types.php | 788 +
.../lib/Airavata/Model/Application/Io/Types.php | 23 +
.../Airavata/Model/Credential/Store/Types.php | 1099 +
.../lib/Airavata/Model/Data/Product/Types.php | 879 -
.../lib/Airavata/Model/Data/Replica/Types.php | 572 +-
.../lib/Airavata/Model/Data/Resource/Types.php | 854 -
.../lib/Airavata/Model/Dbevent/Types.php | 573 +
.../lib/Airavata/Model/Experiment/Types.php | 23 +
.../lib/Airavata/Model/Group/Types.php | 2 +
.../Airavata/Model/Messaging/Event/Types.php | 2 +
.../lib/Airavata/Model/Process/Types.php | 67 +-
.../lib/Airavata/Model/Status/Types.php | 190 +
.../resources/lib/Airavata/Model/Task/Types.php | 44 +-
.../lib/Airavata/Model/Tenant/Types.php | 528 +
.../resources/lib/Airavata/Model/User/Types.php | 279 +-
.../resources/lib/Airavata/Model/job/Types.php | 22 +-
.../src/main/resources/lib/Types.php | 13 +
.../resources/php-cli-samples/getAPIVersion.php | 3 +-
.../php-cli-samples/getAiravataClient.php | 8 +-
.../resources/php-cli-samples/isUserExists.php | 53 +
.../airavata-python-sdk/pom.xml | 27 +-
.../src/main/assembly/bin-assembly.xml | 29 +-
.../lib/apache/airavata/api/Airavata-remote | 206 +-
.../lib/apache/airavata/api/Airavata.py | 24916 ++--
.../lib/apache/airavata/api/constants.py | 2 +-
.../lib/apache/airavata/api/error/ttypes.py | 76 +
.../resources/lib/apache/airavata/api/ttypes.py | 3 +
.../model/appcatalog/appdeployment/ttypes.py | 67 +-
.../model/appcatalog/computeresource/ttypes.py | 140 +-
.../appcatalog/credentialsummary/__init__.py | 1 +
.../appcatalog/credentialsummary/constants.py | 11 +
.../appcatalog/credentialsummary/ttypes.py | 154 +
.../appcatalog/userresourceprofile/__init__.py | 1 +
.../appcatalog/userresourceprofile/constants.py | 11 +
.../appcatalog/userresourceprofile/ttypes.py | 538 +
.../airavata/model/application/io/ttypes.py | 15 +-
.../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 +
.../apache/airavata/model/experiment/ttypes.py | 15 +-
.../lib/apache/airavata/model/group/ttypes.py | 3 +
.../lib/apache/airavata/model/job/ttypes.py | 22 +-
.../airavata/model/messaging/event/ttypes.py | 3 +
.../lib/apache/airavata/model/process/ttypes.py | 55 +-
.../lib/apache/airavata/model/status/ttypes.py | 142 +
.../lib/apache/airavata/model/task/ttypes.py | 46 +-
.../apache/airavata/model/tenant/__init__.py | 1 +
.../apache/airavata/model/tenant/constants.py | 11 +
.../lib/apache/airavata/model/tenant/ttypes.py | 352 +
.../lib/apache/airavata/model/ttypes.py | 3 +
.../lib/apache/airavata/model/user/ttypes.py | 231 +-
.../credential_store_data_models/__init__.py | 1 +
.../credential_store_data_models/constants.py | 12 +
.../lib/credential_store_data_models/ttypes.py | 786 +
.../main/resources/samples/AiravataClient.py | 306 +
.../resources/samples/testAiravataClient.py | 32 +
.../java-client-samples/pom.xml | 26 +-
.../client/samples/CancelExperiments.java | 4 +-
.../client/samples/CreateLaunchBES.java | 3 +-
.../client/samples/CreateLaunchExperiment.java | 6 +-
.../samples/CreateLaunchExperimentUS3.java | 2 +-
.../client/samples/ReplicaCatalogSample.java | 5 +-
.../client/samples/SampleEchoExperiment.java | 4 +-
.../client/OAuthAppRegisteringClient.java | 3 +-
.../client/OAuthTokenRetrievalClient.java | 3 +-
.../client/secure/client/Properties.java | 3 +-
.../client/secure/client/SecureClient.java | 3 +-
.../tools/RegisterOGCEUS3Application.java | 6 +-
.../tools/RegisterSampleApplications.java | 5 +-
.../tools/RegisterSampleApplicationsUtils.java | 19 +
.../client/tools/RegisterUS3Application.java | 6 +-
airavata-api/airavata-client-sdks/pom.xml | 26 +-
airavata-api/airavata-data-models/pom.xml | 31 +-
.../ApplicationDeploymentDescription.java | 514 +-
.../application_deployment_modelConstants.java | 28 +-
.../application_interface_modelConstants.java | 28 +-
.../appcatalog/computeresource/BatchQueue.java | 406 +-
.../ComputeResourceDescription.java | 404 +-
.../computeresource/LOCALSubmission.java | 53 +-
.../appcatalog/computeresource/MonitorMode.java | 16 +-
.../computeresource/ResourceJobManagerType.java | 8 +-
.../compute_resource_modelConstants.java | 28 +-
.../gatewayprofile/DataStoragePreference.java | 28 +-
.../UserComputeResourcePreference.java | 1381 +
.../UserResourceProfile.java | 1277 +
.../UserStoragePreference.java | 728 +
.../application/io/InputDataObjectType.java | 107 +-
.../credential/store/CertificateCredential.java | 1142 +
.../model/credential/store/CommunityUser.java | 608 +
.../credential/store/CredentialOwnerType.java | 62 +
.../credential/store/CredentialSummary.java | 1040 +
.../credential/store/PasswordCredential.java | 1028 +
.../model/credential/store/SSHCredential.java | 1265 +
.../credential/store/SSHCredentialSummary.java | 929 +
.../model/credential/store/SummaryType.java | 69 +
.../credential_store_data_modelsConstants.java | 58 +
.../model/data/replica/DataProductModel.java | 84 +-
.../data/replica/DataReplicaLocationModel.java | 44 +-
.../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/DuplicateEntryException.java | 413 +
.../experiment/UserConfigurationDataModel.java | 107 +-
.../model/group/ResourcePermissionType.java | 5 +-
.../org/apache/airavata/model/job/JobModel.java | 103 +-
.../model/messaging/event/MessageType.java | 5 +-
.../model/messaging/event/TaskSubmitEvent.java | 28 +-
.../messaging/event/TaskTerminateEvent.java | 28 +-
.../event/messaging_eventsConstants.java | 28 +-
.../airavata/model/process/ProcessModel.java | 284 +-
.../airavata/model/status/QueueStatusModel.java | 891 +
.../apache/airavata/model/task/TaskModel.java | 178 +-
.../apache/airavata/model/tenant/Tenant.java | 2322 +
.../model/tenant/TenantApprovalStatus.java | 77 +
.../airavata/model/user/NSFDemographics.java | 149 +-
.../apache/airavata/model/user/UserProfile.java | 882 +-
.../model/workflow_data_modelConstants.java | 28 +-
airavata-api/airavata-model-utils/pom.xml | 36 +-
.../airavata/model/util/AppDeploymentUtil.java | 4 +-
.../airavata/model/util/AppInterfaceUtil.java | 4 +-
.../model/util/ComputeResourceUtil.java | 4 +-
.../airavata/model/util/ExecutionType.java | 4 +-
.../model/util/ExperimentModelUtil.java | 5 +-
.../airavata/model/util/ProjectModelUtil.java | 2 +-
airavata-api/pom.xml | 26 +-
airavata-services/pom.xml | 70 +
.../iam-admin-services-core/pom.xml | 62 +
.../core/impl/TenantManagementKeycloakImpl.java | 351 +
.../interfaces/TenantManagementInterface.java | 101 +
.../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 | 106 +
.../commons/tenant/entities/GatewayEntity.java | 254 +
.../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 | 23 +
.../service/profile/commons/utils/Utils.java | 147 +
.../src/main/resources/META-INF/persistence.xml | 35 +
.../profile-service-server/pom.xml | 59 +
.../handlers/IamAdminServicesHandler.java | 131 +
.../handlers/TenantProfileServiceHandler.java | 194 +
.../handlers/UserProfileServiceHandler.java | 173 +
.../profile/server/ProfileServiceServer.java | 181 +
.../profile/utils/ProfileServiceUtils.java | 70 +
.../profile-service-stubs/pom.xml | 37 +
.../client/ProfileServiceClientFactory.java | 63 +
.../admin/services/cpi/IamAdminServices.java | 8240 ++
.../exception/IamAdminServicesException.java | 407 +
.../cpi/iam_admin_services_cpiConstants.java | 59 +
.../tenant/cpi/TenantProfileService.java | 8359 ++
.../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 | 71 +
.../profile-service/profile-user-core/pom.xml | 85 +
.../UserProfileRegistryException.java | 28 +
.../repositories/UserProfileRepository.java | 91 +
.../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 | 289 +
.../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 +
apache-license-header.txt | 17 +
dev-tools/ansible/.gitignore | 2 +
dev-tools/ansible/NOTE | 5 +
dev-tools/ansible/README.md | 36 +
dev-tools/ansible/airavata-iam-setup.yml | 8 +
dev-tools/ansible/airavata.yml | 59 +
dev-tools/ansible/ansible.cfg | 2 +
dev-tools/ansible/dev_airavata_deploy.yml | 34 +
dev-tools/ansible/dev_pga_deploy.yml | 37 +
.../inventories/airavata-iam/group_vars/all.yml | 16 +
.../ansible/inventories/airavata-iam/hosts | 8 +
.../inventories/develop/group_vars/.gitignore | 1 +
.../inventories/develop/group_vars/all.yml | 123 +
.../develop/group_vars/dev-airavata.yml | 22 +
.../inventories/develop/group_vars/dev-pga.yml | 23 +
.../develop/group_vars/local.yml.template | 4 +
dev-tools/ansible/inventories/develop/hosts | 35 +
.../geogateway-dev/group_vars/pga/vars.yml | 53 +
.../geogateway-dev/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/geogateway-dev/hosts | 2 +
.../dreg-production/files/pga-ssl-vhost.conf.j2 | 31 +
.../dreg-production/group_vars/pga/vars.yml | 67 +
.../dreg-production/group_vars/pga/vault.yml | 18 +
.../inventories/scigap/dreg-production/hosts | 21 +
.../scigap/production/files/airavata.jks | 76 +
.../scigap/production/files/airavata_sym.jks | 30 +
.../production/files/client_truststore.jks | 126 +
.../scigap/production/group_vars/all/vars.yml | 126 +
.../scigap/production/group_vars/all/vault.yml | 20 +
.../ansible/inventories/scigap/production/hosts | 20 +
.../production/pga_config/brandeis/vars.yml | 51 +
.../production/pga_config/brandeis/vault.yml | 18 +
.../production/pga_config/cinetvtech/vars.yml | 55 +
.../production/pga_config/cinetvtech/vault.yml | 18 +
.../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 +
.../pga_config/cornell-dnasequence/vars.yml | 63 +
.../pga_config/cornell-dnasequence/vault.yml | 18 +
.../production/pga_config/georgiastate/vars.yml | 55 +
.../pga_config/georgiastate/vault.yml | 18 +
.../production/pga_config/iugateway/vars.yml | 55 +
.../production/pga_config/iugateway/vault.yml | 18 +
.../scigap/production/pga_config/lsu/vars.yml | 51 +
.../scigap/production/pga_config/lsu/vault.yml | 18 +
.../scigap/production/pga_config/nsg/vars.yml | 56 +
.../scigap/production/pga_config/nsg/vault.yml | 18 +
.../production/pga_config/oiitandy/vars.yml | 55 +
.../production/pga_config/oiitandy/vault.yml | 18 +
.../scigap/production/pga_config/oscer/vars.yml | 55 +
.../production/pga_config/oscer/vault.yml | 18 +
.../production/pga_config/phasta/vars.yml | 55 +
.../production/pga_config/phasta/vault.yml | 18 +
.../production/pga_config/scigap/vars.yml | 56 +
.../production/pga_config/scigap/vault.yml | 18 +
.../production/pga_config/seagrid/vars.yml | 56 +
.../production/pga_config/seagrid/vault.yml | 18 +
.../production/pga_config/simvascular/vars.yml | 55 +
.../production/pga_config/simvascular/vault.yml | 18 +
.../production/pga_config/southdakota/vars.yml | 55 +
.../production/pga_config/southdakota/vault.yml | 18 +
.../pga_config/southernillinois/vars.yml | 55 +
.../pga_config/southernillinois/vault.yml | 18 +
.../production/pga_config/testdrive/vars.yml | 56 +
.../production/pga_config/testdrive/vault.yml | 18 +
.../production/pga_config/ultrascan/vars.yml | 64 +
.../production/pga_config/ultrascan/vault.yml | 18 +
.../scigap/production/pga_config/utah/vars.yml | 55 +
.../scigap/production/pga_config/utah/vault.yml | 18 +
.../testing-0.17-scigap/group_vars/all/vars.yml | 111 +
.../group_vars/all/vault.yml | 7 +
.../testing-0.17-scigap/group_vars/pga/vars.yml | 52 +
.../group_vars/pga/vault.yml | 18 +
.../inventories/testing-0.17-scigap/hosts | 23 +
.../group_vars/all/vars.yml | 111 +
.../group_vars/all/vault.yml | 7 +
.../group_vars/pga/vars.yml | 51 +
.../group_vars/pga/vault.yml | 18 +
.../inventories/testing-0.17-testdrive/hosts | 23 +
.../inventories/testing-0.17/files/airavata.jks | 76 +
.../testing-0.17/files/airavata_sym.jks | 30 +
.../testing-0.17/files/client_truststore.jks | 271 +
.../testing-0.17/group_vars/all/vars.yml | 115 +
.../testing-0.17/group_vars/all/vault.yml | 13 +
.../testing-0.17/group_vars/pga/vars.yml | 54 +
.../testing-0.17/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/testing-0.17/hosts | 23 +
dev-tools/ansible/local_airavata_deploy.yml | 29 +
dev-tools/ansible/pga-scigap-prod.yml | 41 +
dev-tools/ansible/pga-single-vhost.yml | 37 +
dev-tools/ansible/pga.yml | 28 +
.../ansible/roles/airavata_build/tasks/main.yml | 39 +
.../roles/airavata_deploy/defaults/main.yml | 22 +
.../roles/airavata_deploy/handlers/main.yml | 48 +
.../roles/airavata_deploy/tasks/main.yml | 124 +
.../ansible/roles/api-orch/defaults/main.yml | 27 +
.../files/mysql-connector-java-5.1.37-bin.jar | Bin 0 -> 985603 bytes
.../ansible/roles/api-orch/handlers/main.yml | 34 +
dev-tools/ansible/roles/api-orch/tasks/main.yml | 105 +
.../templates/airavata-server.properties.j2 | 330 +
.../api-orch/templates/gfac-config.yaml.j2 | 117 +
.../roles/api-orch/templates/logback.xml.j2 | 55 +
.../ansible/roles/common/defaults/main.yml | 23 +
.../ansible/roles/common/files/airavata.jks | Bin 0 -> 2289 bytes
.../ansible/roles/common/files/airavata_sym.jks | Bin 0 -> 501 bytes
dev-tools/ansible/roles/common/tasks/main.yml | 75 +
dev-tools/ansible/roles/common/vars/main.yml | 24 +
.../ansible/roles/database/defaults/main.yml | 21 +
.../database/files/MariaDB_yum_CentOS_7.repo | 7 +
.../ansible/roles/database/files/mysql-tmp.te | 9 +
.../ansible/roles/database/handlers/main.yml | 34 +
dev-tools/ansible/roles/database/tasks/main.yml | 137 +
.../roles/database/tasks/secure_install.yml | 43 +
.../ansible/roles/database/templates/my.cnf.j2 | 4 +
dev-tools/ansible/roles/database/vars/main.yml | 44 +
.../ansible/roles/env_setup/tasks/main.yml | 56 +
.../ansible/roles/env_setup/tasks/redhat.yml | 32 +
dev-tools/ansible/roles/gfac/defaults/main.yml | 21 +
.../files/mysql-connector-java-5.1.37-bin.jar | Bin 0 -> 985603 bytes
dev-tools/ansible/roles/gfac/handlers/main.yml | 28 +
dev-tools/ansible/roles/gfac/tasks/main.yml | 97 +
.../templates/airavata-server.properties.j2 | 297 +
.../roles/gfac/templates/gfac-config.yaml.j2 | 119 +
.../ansible/roles/gfac/templates/logback.xml.j2 | 55 +
dev-tools/ansible/roles/java/tasks/main.yml | 47 +
dev-tools/ansible/roles/java/vars/main.yml | 35 +
dev-tools/ansible/roles/keycloak/README.md | 14 +
.../ansible/roles/keycloak/defaults/main.yml | 12 +
.../ansible/roles/keycloak/files/README.md | 36 +
dev-tools/ansible/roles/keycloak/tasks/main.yml | 180 +
.../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 | 77 +
dev-tools/ansible/roles/pga/files/default.conf | 5 +
dev-tools/ansible/roles/pga/handlers/main.yml | 33 +
.../roles/pga/tasks/install_deps_CentOS_7.yml | 54 +
.../roles/pga/tasks/install_deps_Ubuntu_14.yml | 68 +
.../roles/pga/tasks/install_deps_Ubuntu_16.yml | 81 +
dev-tools/ansible/roles/pga/tasks/main.yml | 155 +
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 29 +
.../roles/pga/templates/pga-vhost.conf.j2 | 14 +
.../roles/pga/templates/pga_config.php.j2 | 256 +
.../ansible/roles/pga_deploy/handlers/main.yml | 23 +
.../ansible/roles/pga_deploy/tasks/main.yml | 27 +
.../ansible/roles/rabbitmq/handlers/main.yml | 33 +
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 80 +
dev-tools/ansible/roles/rabbitmq/vars/main.yml | 22 +
.../files/mysql-connector-java-5.1.37-bin.jar | Bin 0 -> 985603 bytes
dev-tools/ansible/roles/registry/tasks/main.yml | 79 +
.../templates/airavata-server.properties.j2 | 301 +
dev-tools/ansible/roles/wso2_is/tasks/main.yml | 61 +
.../roles/wso2_is/templates/carbon.xml.j2 | 688 +
dev-tools/ansible/roles/wso2_is/vars/main.yml | 38 +
.../ansible/roles/zookeeper/handlers/main.yml | 32 +
.../ansible/roles/zookeeper/tasks/main.yml | 54 +
.../roles/zookeeper/templates/zoo.cfg.j2 | 28 +
.../zookeeper/templates/zookeeper.service.j2 | 15 +
dev-tools/ansible/roles/zookeeper/vars/main.yml | 37 +
dev-tools/ansible/site.yml | 96 +
modules/amqpwstunnel/python/amqpwstunnel.py | 583 -
modules/amqpwstunnel/python/config.json | 10 -
modules/amqpwstunnel/wstest.html | 157 -
modules/cloud/ansible-playbooks/README.md | 119 +
.../cloud/ansible-playbooks/group_vars/all.yml | 39 +
modules/cloud/ansible-playbooks/hosts | 13 +
.../ansible-playbooks/roles/ec2/tasks/main.yml | 50 +
.../roles/ec2/vars/aws-credential.yml | 23 +
.../ansible-playbooks/roles/ec2/vars/main.yml | 28 +
.../ansible-playbooks/roles/java/tasks/main.yml | 41 +
.../ansible-playbooks/roles/java/vars/main.yml | 35 +
.../roles/mesos-master/tasks/backup_main.yml | 137 +
.../roles/mesos-master/tasks/main.yml | 106 +
.../roles/mesos-master/templates/quorum.j2 | 1 +
.../roles/mesos-master/templates/zk.j2 | 1 +
.../roles/mesos-slave/tasks/main.yml | 86 +
.../roles/mesos-slave/templates/zk.j2 | 1 +
.../roles/openstack/tasks/main.yml | 48 +
.../roles/openstack/vars/main.yml | 30 +
.../openstack/vars/openstack-credentials.yml | 30 +
.../ansible-playbooks/roles/test/tasks/main.yml | 23 +
.../roles/zookeeper/handlers/main.yml | 35 +
.../roles/zookeeper/tasks/main.yml | 118 +
.../roles/zookeeper/templates/myid.j2 | 1 +
.../roles/zookeeper/templates/zoo.cfg.j2 | 32 +
.../roles/zookeeper/vars/main.yml | 35 +
modules/cloud/ansible-playbooks/site.yml | 44 +
modules/cloud/aurora-client/README.md | 49 +
modules/cloud/aurora-client/pom.xml | 83 +
.../client/AuroraSchedulerClientFactory.java | 98 +
.../cloud/aurora/client/AuroraThriftClient.java | 335 +
.../aurora/client/bean/GetJobsResponseBean.java | 63 +
.../cloud/aurora/client/bean/IdentityBean.java | 58 +
.../cloud/aurora/client/bean/JobConfigBean.java | 236 +
.../client/bean/JobDetailsResponseBean.java | 69 +
.../cloud/aurora/client/bean/JobKeyBean.java | 104 +
.../client/bean/PendingJobReasonBean.java | 70 +
.../cloud/aurora/client/bean/ProcessBean.java | 193 +
.../cloud/aurora/client/bean/ResourceBean.java | 104 +
.../cloud/aurora/client/bean/ResponseBean.java | 79 +
.../aurora/client/bean/ServerInfoBean.java | 87 +
.../aurora/client/bean/TaskConfigBean.java | 136 +
.../cloud/aurora/client/sdk/AppcImage.java | 549 +
.../cloud/aurora/client/sdk/AssignedTask.java | 1084 +
.../cloud/aurora/client/sdk/Attribute.java | 574 +
.../cloud/aurora/client/sdk/AuroraAdmin.java | 14400 ++
.../client/sdk/AuroraSchedulerManager.java | 13414 ++
.../cloud/aurora/client/sdk/ConfigGroup.java | 581 +
.../cloud/aurora/client/sdk/ConfigRewrite.java | 389 +
.../cloud/aurora/client/sdk/ConfigSummary.java | 581 +
.../aurora/client/sdk/ConfigSummaryResult.java | 422 +
.../cloud/aurora/client/sdk/Constraint.java | 539 +
.../cloud/aurora/client/sdk/Container.java | 392 +
.../aurora/client/sdk/CronCollisionPolicy.java | 80 +
.../aurora/client/sdk/DockerContainer.java | 606 +
.../cloud/aurora/client/sdk/DockerImage.java | 549 +
.../aurora/client/sdk/DockerParameter.java | 549 +
.../aurora/client/sdk/DrainHostsResult.java | 471 +
.../aurora/client/sdk/EndMaintenanceResult.java | 471 +
.../cloud/aurora/client/sdk/ExecutorConfig.java | 546 +
.../sdk/ExplicitReconciliationSettings.java | 412 +
.../client/sdk/GetJobUpdateDetailsResult.java | 584 +
.../client/sdk/GetJobUpdateDiffResult.java | 996 +
.../client/sdk/GetJobUpdateSummariesResult.java | 474 +
.../cloud/aurora/client/sdk/GetJobsResult.java | 471 +
.../client/sdk/GetPendingReasonResult.java | 471 +
.../cloud/aurora/client/sdk/GetQuotaResult.java | 931 +
.../aurora/client/sdk/GetTierConfigResult.java | 603 +
.../cloud/aurora/client/sdk/HostAttributes.java | 810 +
.../cloud/aurora/client/sdk/HostStatus.java | 538 +
.../airavata/cloud/aurora/client/sdk/Hosts.java | 466 +
.../cloud/aurora/client/sdk/Identity.java | 417 +
.../airavata/cloud/aurora/client/sdk/Image.java | 392 +
.../client/sdk/InstanceConfigRewrite.java | 678 +
.../cloud/aurora/client/sdk/InstanceKey.java | 552 +
.../aurora/client/sdk/InstanceTaskConfig.java | 608 +
.../aurora/client/sdk/JobConfigRewrite.java | 556 +
.../aurora/client/sdk/JobConfiguration.java | 1049 +
.../client/sdk/JobInstanceUpdateEvent.java | 666 +
.../cloud/aurora/client/sdk/JobKey.java | 666 +
.../cloud/aurora/client/sdk/JobStats.java | 760 +
.../cloud/aurora/client/sdk/JobSummary.java | 649 +
.../aurora/client/sdk/JobSummaryResult.java | 471 +
.../cloud/aurora/client/sdk/JobUpdate.java | 559 +
.../aurora/client/sdk/JobUpdateAction.java | 101 +
.../aurora/client/sdk/JobUpdateDetails.java | 776 +
.../cloud/aurora/client/sdk/JobUpdateEvent.java | 798 +
.../client/sdk/JobUpdateInstructions.java | 730 +
.../cloud/aurora/client/sdk/JobUpdateKey.java | 554 +
.../aurora/client/sdk/JobUpdatePulseStatus.java | 74 +
.../cloud/aurora/client/sdk/JobUpdateQuery.java | 1189 +
.../aurora/client/sdk/JobUpdateRequest.java | 848 +
.../aurora/client/sdk/JobUpdateSettings.java | 1285 +
.../cloud/aurora/client/sdk/JobUpdateState.java | 666 +
.../aurora/client/sdk/JobUpdateStatus.java | 129 +
.../aurora/client/sdk/JobUpdateSummary.java | 850 +
.../aurora/client/sdk/LimitConstraint.java | 419 +
.../aurora/client/sdk/ListBackupsResult.java | 466 +
.../airavata/cloud/aurora/client/sdk/Lock.java | 903 +
.../cloud/aurora/client/sdk/LockKey.java | 331 +
.../aurora/client/sdk/MaintenanceMode.java | 70 +
.../client/sdk/MaintenanceStatusResult.java | 471 +
.../cloud/aurora/client/sdk/MesosContainer.java | 432 +
.../aurora/client/sdk/MesosFetcherURI.java | 661 +
.../cloud/aurora/client/sdk/Metadata.java | 525 +
.../airavata/cloud/aurora/client/sdk/Mode.java | 73 +
.../cloud/aurora/client/sdk/Package.java | 625 +
.../cloud/aurora/client/sdk/PendingReason.java | 522 +
.../aurora/client/sdk/PopulateJobResult.java | 422 +
.../aurora/client/sdk/PulseJobUpdateResult.java | 436 +
.../aurora/client/sdk/QueryRecoveryResult.java | 471 +
.../airavata/cloud/aurora/client/sdk/Range.java | 517 +
.../aurora/client/sdk/ReadOnlyScheduler.java | 11291 ++
.../cloud/aurora/client/sdk/Resource.java | 561 +
.../aurora/client/sdk/ResourceAggregate.java | 820 +
.../cloud/aurora/client/sdk/Response.java | 840 +
.../cloud/aurora/client/sdk/ResponseCode.java | 85 +
.../cloud/aurora/client/sdk/ResponseDetail.java | 417 +
.../cloud/aurora/client/sdk/Result.java | 1487 +
.../client/sdk/RewriteConfigsRequest.java | 471 +
.../cloud/aurora/client/sdk/RoleSummary.java | 619 +
.../aurora/client/sdk/RoleSummaryResult.java | 471 +
.../cloud/aurora/client/sdk/ScheduleStatus.java | 143 +
.../aurora/client/sdk/ScheduleStatusResult.java | 471 +
.../cloud/aurora/client/sdk/ScheduledTask.java | 973 +
.../cloud/aurora/client/sdk/ServerInfo.java | 537 +
.../aurora/client/sdk/StartJobUpdateResult.java | 562 +
.../client/sdk/StartMaintenanceResult.java | 471 +
.../cloud/aurora/client/sdk/TaskConfig.java | 2769 +
.../cloud/aurora/client/sdk/TaskConstraint.java | 392 +
.../cloud/aurora/client/sdk/TaskEvent.java | 794 +
.../cloud/aurora/client/sdk/TaskQuery.java | 1611 +
.../cloud/aurora/client/sdk/TierConfig.java | 601 +
.../aurora/client/sdk/ValueConstraint.java | 585 +
.../cloud/aurora/client/sdk/Volume.java | 674 +
.../aurora/client/sdk/aurora_apiConstants.java | 124 +
.../cloud/aurora/sample/AuroraClientSample.java | 187 +
.../aurora/util/AuroraThriftClientUtil.java | 424 +
.../airavata/cloud/aurora/util/Constants.java | 47 +
.../cloud/aurora/util/ResponseCodeEnum.java | 95 +
.../cloud/aurora/util/ResponseResultType.java | 47 +
.../src/main/resources/aurora-api.thrift | 1238 +
.../main/resources/aurora-scheduler.properties | 11 +
.../resources/executor-config-template.json | 48 +
modules/cloud/cloud-provisioning/pom.xml | 43 +-
.../airavata/cloud/intf/CloudInterface.java | 4 +-
.../cloud/intf/impl/OpenstackIntfImpl.java | 4 +-
.../cloud/openstack/OS4JClientProvider.java | 4 +-
.../apache/airavata/cloud/util/CloudRef.java | 4 +-
.../apache/airavata/cloud/util/Constants.java | 6 +-
.../org/apache/airavata/cloud/util/IPType.java | 4 +-
.../airavata/cloud/util/OpenstackIntfUtil.java | 4 +-
.../airavata/cloud/test/CloudIntfTest.java | 25 +-
modules/cloud/pom.xml | 57 +-
.../org/apache/airavata/cloud/CloudMain.java | 3 +-
modules/cluster-monitoring/pom.xml | 93 +
.../monitoring/ClusterStatusMonitorJob.java | 285 +
.../ClusterStatusMonitorJobScheduler.java | 69 +
modules/commons/pom.xml | 58 +-
.../airavata/common/utils/BuildConstant.java | 24 +
.../airavata/common/context/RequestContext.java | 4 +-
.../common/context/WorkflowContext.java | 4 +-
.../AiravataConfigurationException.java | 4 +-
.../common/exception/AiravataException.java | 4 +-
.../exception/AiravataStartupException.java | 4 +-
.../exception/ApplicationSettingsException.java | 4 +-
.../airavata/common/logging/Exception.java | 65 +
.../airavata/common/logging/LogEntry.java | 131 +
.../airavata/common/logging/MDCConstants.java | 29 +
.../apache/airavata/common/logging/MDCUtil.java | 51 +
.../airavata/common/logging/ServerId.java | 67 +
.../common/logging/kafka/KafkaAppender.java | 114 +
.../airavata/common/utils/AiravataJobState.java | 5 +-
.../airavata/common/utils/AiravataUtils.java | 6 +-
.../airavata/common/utils/AiravataZKUtils.java | 18 +-
.../common/utils/ApplicationSettings.java | 74 +-
.../airavata/common/utils/AwsMetadata.java | 136 +
.../airavata/common/utils/BrowserLauncher.java | 4 +-
.../airavata/common/utils/ClientSettings.java | 4 +-
.../apache/airavata/common/utils/Constants.java | 4 +-
.../common/utils/DBEventManagerConstants.java | 99 +
.../airavata/common/utils/DBEventService.java | 42 +
.../apache/airavata/common/utils/DBUtil.java | 4 +-
.../common/utils/DatabaseTestCases.java | 4 +-
.../utils/DefaultKeyStorePasswordCallback.java | 4 +-
.../apache/airavata/common/utils/DerbyUtil.java | 4 +-
.../airavata/common/utils/ExecutionMode.java | 4 +-
.../apache/airavata/common/utils/IOUtil.java | 4 +-
.../apache/airavata/common/utils/IServer.java | 4 +-
.../apache/airavata/common/utils/JSONUtil.java | 4 +-
.../common/utils/KeyStorePasswordCallback.java | 19 +
.../common/utils/LocalEventPublisher.java | 5 +-
.../airavata/common/utils/NameValidator.java | 4 +-
.../org/apache/airavata/common/utils/Pair.java | 4 +-
.../airavata/common/utils/SecurityUtil.java | 4 +-
.../airavata/common/utils/ServerSettings.java | 108 +-
.../airavata/common/utils/ServiceUtils.java | 19 +
.../airavata/common/utils/StringUtil.java | 4 +-
.../apache/airavata/common/utils/SwingUtil.java | 4 +-
.../airavata/common/utils/ThriftUtils.java | 4 +-
.../apache/airavata/common/utils/Version.java | 4 +-
.../airavata/common/utils/WSConstants.java | 4 +-
.../apache/airavata/common/utils/WSDLUtil.java | 4 +-
.../apache/airavata/common/utils/XMLUtil.java | 586 -
.../airavata/common/utils/XmlFormatter.java | 82 -
.../airavata/common/utils/ZkConstants.java | 3 +-
.../listener/AbstractActivityListener.java | 4 +-
.../listener/AbstractStateChangeRequest.java | 4 +-
.../common/utils/listener/PublisherMessage.java | 4 +-
.../common/utils/ApplicationSettingsTest.java | 4 +-
.../airavata/common/utils/SecurityUtilTest.java | 4 +-
.../airavata/common/utils/XMLUtilTest.java | 56 -
modules/configuration/client/pom.xml | 26 +-
modules/configuration/pom.xml | 26 +-
modules/configuration/server/pom.xml | 26 +-
.../src/main/resources/CLOUD_Groovy.template | 7 +
.../src/main/resources/FORK_Groovy.template | 13 +
.../server/src/main/resources/ForkTemplate.xslt | 24 -
.../server/src/main/resources/LSFTemplate.xslt | 92 -
.../src/main/resources/LSF_Groovy.template | 30 +
.../server/src/main/resources/PBSTemplate.xslt | 107 -
.../src/main/resources/PBS_Groovy.template | 35 +
.../src/main/resources/SLURMTemplate.xslt | 102 -
.../src/main/resources/SLURM_Groovy.template | 28 +
.../server/src/main/resources/UGETemplate.xslt | 78 -
.../src/main/resources/UGE_Groovy.template | 29 +
.../resources/airavata-default-xacml-policy.xml | 20 +-
.../main/resources/airavata-server.properties | 101 +-
.../src/main/resources/client_truststore.jks | Bin 2423 -> 5312 bytes
.../server/src/main/resources/gfac-config.yaml | 13 +-
.../main/resources/grouper.hibernate.properties | 10 -
.../server/src/main/resources/log4j.properties | 48 -
.../server/src/main/resources/logback.xml | 55 +
.../server/src/main/resources/sources.xml | 875 -
.../credential-store-service/pom.xml | 52 +-
.../credential/store/credential/AuditInfo.java | 4 +-
.../store/credential/CommunityUser.java | 4 +-
.../credential/store/credential/Credential.java | 21 +-
.../store/credential/CredentialOwnerType.java | 47 +
.../impl/certificate/CertificateAuditInfo.java | 6 +-
.../impl/certificate/CertificateCredential.java | 4 +-
.../impl/password/PasswordCredential.java | 4 +-
.../credential/impl/ssh/SSHCredential.java | 4 +-
.../impl/ssh/SSHCredentialGenerator.java | 4 +-
.../store/notifier/CredentialStoreNotifier.java | 19 +
.../store/notifier/NotificationMessage.java | 4 +-
.../store/notifier/NotifierBootstrap.java | 4 +-
.../notifier/impl/EmailNotificationMessage.java | 4 +-
.../store/notifier/impl/EmailNotifier.java | 4 +-
.../impl/EmailNotifierConfiguration.java | 4 +-
.../store/server/CredentialStoreServer.java | 3 +-
.../server/CredentialStoreServerHandler.java | 142 +-
.../store/servlet/CredentialBootstrapper.java | 4 +-
.../servlet/CredentialStoreCallbackServlet.java | 4 +-
.../servlet/CredentialStoreStartServlet.java | 4 +-
.../store/store/CredentialReader.java | 4 +-
.../store/store/CredentialReaderFactory.java | 4 +-
.../store/store/CredentialStoreException.java | 4 +-
.../store/store/CredentialWriter.java | 4 +-
.../store/impl/CertificateCredentialWriter.java | 4 +-
.../store/store/impl/CredentialReaderImpl.java | 4 +-
.../store/store/impl/SSHCredentialWriter.java | 4 +-
.../store/store/impl/db/CommunityUserDAO.java | 4 +-
.../store/store/impl/db/CredentialsDAO.java | 30 +-
.../store/store/impl/db/ParentDAO.java | 4 +-
.../store/store/impl/util/ConnectionPool.java | 381 +
.../impl/util/CredentialStoreInitUtil.java | 154 +
.../store/store/impl/util/DatabaseCreator.java | 352 +
.../store/store/impl/util/JdbcStorage.java | 174 +
.../store/util/ConfigurationReader.java | 4 +-
.../store/util/CredentialStoreConstants.java | 4 +-
.../credential/store/util/PrivateKeyStore.java | 4 +-
.../credential/store/util/TokenGenerator.java | 4 +-
.../airavata/credential/store/util/Utility.java | 4 +-
.../cpi/SSHSummaryTest/SSHSummaryTest.java | 192 +
.../store/notifier/impl/EmailNotifierTest.java | 4 +-
.../store/impl/db/CommunityUserDAOTest.java | 4 +-
.../store/store/impl/db/CredentialsDAOTest.java | 18 +-
.../store/store/impl/db/SSHCredentialTest.java | 6 +-
.../store/util/ConfigurationReaderTest.java | 4 +-
.../store/util/TokenGeneratorTest.java | 4 +-
.../credential-store-stubs/pom.xml | 55 +-
.../client/CredentialStoreClientFactory.java | 4 +-
.../credential/store/client/TestSSLClient.java | 9 +-
.../store/cpi/CredentialStoreService.java | 4660 +-
.../cpi/credential_store_cpiConstants.java | 19 +
.../store/datamodel/APICredential.java | 723 -
.../store/datamodel/CertificateCredential.java | 1149 -
.../store/datamodel/CommunityUser.java | 609 -
.../store/datamodel/PasswordCredential.java | 1032 -
.../store/datamodel/SSHCredential.java | 1044 -
.../credential_store_data_modelsConstants.java | 57 -
.../exception/CredentialStoreException.java | 21 +-
modules/credential-store/pom.xml | 26 +-
modules/db-event-manager/pom.xml | 41 +
.../db/event/manager/DBEventManagerRunner.java | 78 +
.../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 | 330 +-
.../src/main/assembly/bin-assembly.xml | 51 +-
.../src/main/assembly/src-assembly.xml | 37 +-
.../main/resources/bin/airavata-server-start.sh | 17 +-
.../gfac-application-specific-handlers/pom.xml | 31 +-
.../gaussian/handler/GaussianHandler.java | 19 +
modules/gfac/gfac-bes/pom.xml | 29 +-
.../gfac/bes/handlers/AbstractSMSHandler.java | 19 +
.../gfac/bes/handlers/SMSByteIOInHandler.java | 19 +
.../gfac/bes/handlers/SMSByteIOOutHandler.java | 19 +
.../gfac/bes/handlers/SMSDirectoryHandler.java | 19 +
.../gfac/bes/provider/impl/BESProvider.java | 8 +-
.../bes/security/UNICORESecurityContext.java | 19 +
.../gfac/bes/security/X509SecurityContext.java | 5 +-
.../airavata/gfac/bes/utils/ActivityInfo.java | 19 +
.../gfac/bes/utils/ApplicationProcessor.java | 4 +-
.../airavata/gfac/bes/utils/BESConstants.java | 19 +
.../gfac/bes/utils/DataTransferrer.java | 4 +-
.../airavata/gfac/bes/utils/FileDownloader.java | 4 +-
.../gfac/bes/utils/FileTransferBase.java | 4 +-
.../airavata/gfac/bes/utils/FileUploader.java | 4 +-
.../airavata/gfac/bes/utils/JSDLGenerator.java | 3 +-
.../airavata/gfac/bes/utils/JSDLUtils.java | 4 +-
.../apache/airavata/gfac/bes/utils/Mode.java | 4 +-
.../airavata/gfac/bes/utils/MyProxyLogon.java | 19 +
.../airavata/gfac/bes/utils/OSRequirement.java | 4 +-
.../apache/airavata/gfac/bes/utils/OSType.java | 4 +-
.../gfac/bes/utils/ProcessorRequirement.java | 6 +-
.../airavata/gfac/bes/utils/RangeValueType.java | 4 +-
.../gfac/bes/utils/ResourceProcessor.java | 4 +-
.../airavata/gfac/bes/utils/SPMDProcessor.java | 4 +-
.../airavata/gfac/bes/utils/SPMDVariations.java | 4 +-
.../airavata/gfac/bes/utils/SecurityUtils.java | 19 +
.../airavata/gfac/bes/utils/StorageCreator.java | 4 +-
.../gfac/bes/utils/UASDataStagingProcessor.java | 4 +-
.../airavata/gfac/bes/utils/URIUtils.java | 4 +-
.../impl/JSDLGeneratorTestWithMyProxyAuth.java | 6 +-
modules/gfac/gfac-client/pom.xml | 31 +-
.../airavata/gfac/client/GFACInstance.java | 5 +-
.../airavata/gfac/client/GFacClientFactory.java | 5 +-
.../apache/airavata/gfac/cpi/GfacService.java | 21 +-
.../airavata/gfac/cpi/gfac_cpiConstants.java | 19 +
modules/gfac/gfac-core/pom.xml | 34 +-
.../apache/airavata/gfac/core/GFacEngine.java | 12 +-
.../apache/airavata/gfac/core/GFacUtils.java | 372 +-
.../apache/airavata/gfac/core/GroovyMap.java | 111 +
.../airavata/gfac/core/JobDescriptor.java | 489 -
.../org/apache/airavata/gfac/core/Script.java | 79 +
.../core/cluster/AbstractRemoteCluster.java | 12 +-
.../gfac/core/cluster/OutputParser.java | 19 +-
.../gfac/core/cluster/RemoteCluster.java | 43 +-
.../airavata/gfac/core/cluster/ServerInfo.java | 26 +-
.../gfac/core/context/JobExecutionContext.java | 2 +-
.../gfac/core/context/ProcessContext.java | 366 +-
.../airavata/gfac/core/context/TaskContext.java | 2 +-
.../gfac/core/monitor/JobStatusResult.java | 9 +
.../gfac/core/x2012/x12/AfterAnyList.java | 185 -
.../gfac/core/x2012/x12/AfterOKList.java | 185 -
.../gfac/core/x2012/x12/ExportProperties.java | 202 -
.../airavata/gfac/core/x2012/x12/InputList.java | 185 -
.../core/x2012/x12/JobDescriptorDocument.java | 131 -
.../gfac/core/x2012/x12/ModuleLoadCommands.java | 185 -
.../airavata/gfac/core/x2012/x12/PbsParams.java | 1500 -
.../gfac/core/x2012/x12/PostJobCommands.java | 185 -
.../gfac/core/x2012/x12/PreJobCommands.java | 185 -
.../core/x2012/x12/impl/AfterAnyListImpl.java | 254 -
.../core/x2012/x12/impl/AfterOKListImpl.java | 254 -
.../x2012/x12/impl/ExportPropertiesImpl.java | 252 -
.../gfac/core/x2012/x12/impl/InputListImpl.java | 254 -
.../x12/impl/JobDescriptorDocumentImpl.java | 96 -
.../x2012/x12/impl/ModuleLoadCommandsImpl.java | 254 -
.../gfac/core/x2012/x12/impl/PbsParamsImpl.java | 4381 -
.../x2012/x12/impl/PostJobCommandsImpl.java | 254 -
.../core/x2012/x12/impl/PreJobCommandsImpl.java | 254 -
.../src/main/resources/PBSJobDescriptor.xsd | 116 -
.../src/main/resources/gsissh-schemas.xsdconfig | 14 -
.../airavata/gfac/core/GFacUtilsTest.java | 22 +
modules/gfac/gfac-impl/pom.xml | 31 +-
.../java/com/jcraft/jsch/ExtendedSession.java | 4 +-
.../com/jcraft/jsch/GSISSHIdentityFile.java | 4 +-
.../jcraft/jsch/GSISSHIdentityRepository.java | 4 +-
.../java/com/jcraft/jsch/GSSContextX509.java | 4 +-
.../UserAuthGSSAPIWithMICGSSCredentials.java | 4 +-
.../apache/airavata/gfac/impl/AuroraUtils.java | 29 +
.../airavata/gfac/impl/BESRemoteCluster.java | 55 +-
.../gfac/impl/DefaultHostScheduler.java | 3 +-
.../org/apache/airavata/gfac/impl/Factory.java | 312 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 232 +-
.../apache/airavata/gfac/impl/GFacWorker.java | 12 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 147 +-
.../apache/airavata/gfac/impl/HTTPUtils.java | 26 +
.../airavata/gfac/impl/LocalCommandOutput.java | 3 +-
.../airavata/gfac/impl/LocalRemoteCluster.java | 108 +-
.../org/apache/airavata/gfac/impl/SSHUtils.java | 27 +-
.../airavata/gfac/impl/StandardOutReader.java | 5 +-
.../job/AiravataCustomCommandOutputParser.java | 57 +
.../gfac/impl/job/ForkJobConfiguration.java | 6 +-
.../gfac/impl/job/ForkOutputParser.java | 20 +-
.../apache/airavata/gfac/impl/job/JobUtil.java | 3 +-
.../gfac/impl/job/LSFJobConfiguration.java | 5 +-
.../airavata/gfac/impl/job/LSFOutputParser.java | 32 +-
.../gfac/impl/job/PBSJobConfiguration.java | 5 +-
.../airavata/gfac/impl/job/PBSOutputParser.java | 98 +-
.../gfac/impl/job/SlurmJobConfiguration.java | 5 +-
.../gfac/impl/job/SlurmOutputParser.java | 75 +-
.../gfac/impl/job/UGEJobConfiguration.java | 5 +-
.../airavata/gfac/impl/job/UGEOutputParser.java | 97 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 44 +-
.../gfac/impl/task/AuroraJobSubmissionTask.java | 159 +
.../gfac/impl/task/BESJobSubmissionTask.java | 49 +-
.../airavata/gfac/impl/task/DataStageTask.java | 6 +-
.../gfac/impl/task/DataStreamingTask.java | 9 +-
.../impl/task/DefaultJobSubmissionTask.java | 43 +-
.../gfac/impl/task/EnvironmentSetupTask.java | 6 +-
.../gfac/impl/task/ForkJobSubmissionTask.java | 21 +-
.../gfac/impl/task/LocalJobSubmissionTask.java | 156 +-
.../gfac/impl/task/SCPDataStageTask.java | 84 +-
.../airavata/gfac/impl/task/TaskUtils.java | 6 +-
.../gfac/impl/task/utils/StreamData.java | 21 +-
.../gfac/impl/task/utils/bes/ActivityInfo.java | 19 +
.../task/utils/bes/ApplicationProcessor.java | 4 +-
.../gfac/impl/task/utils/bes/BESConstants.java | 19 +
.../impl/task/utils/bes/DataTransferrer.java | 4 +-
.../impl/task/utils/bes/FileDownloader.java | 4 +-
.../impl/task/utils/bes/FileTransferBase.java | 4 +-
.../gfac/impl/task/utils/bes/FileUploader.java | 4 +-
.../gfac/impl/task/utils/bes/JSDLGenerator.java | 8 +-
.../gfac/impl/task/utils/bes/JSDLUtils.java | 4 +-
.../airavata/gfac/impl/task/utils/bes/Mode.java | 4 +-
.../gfac/impl/task/utils/bes/MyProxyLogon.java | 19 +
.../gfac/impl/task/utils/bes/OSType.java | 4 +-
.../task/utils/bes/ProcessorRequirement.java | 6 +-
.../impl/task/utils/bes/RangeValueType.java | 4 +-
.../impl/task/utils/bes/ResourceProcessor.java | 4 +-
.../task/utils/bes/ResourceRequirement.java | 4 +-
.../impl/task/utils/bes/SPMDVariations.java | 4 +-
.../gfac/impl/task/utils/bes/SecurityUtils.java | 19 +
.../impl/task/utils/bes/StorageCreator.java | 4 +-
.../task/utils/bes/UASDataStagingProcessor.java | 4 +-
.../task/utils/bes/UNICORESecurityContext.java | 31 +-
.../gfac/impl/task/utils/bes/URIUtils.java | 4 +-
.../task/utils/bes/X509SecurityContext.java | 5 +-
.../impl/watcher/CancelRequestWatcherImpl.java | 3 +-
.../watcher/RedeliveryRequestWatcherImpl.java | 3 +-
.../handler/LocalDirectorySetupHandler.java | 19 +
.../gfac/local/handler/LocalInputHandler.java | 19 +
.../gfac/local/provider/impl/LocalProvider.java | 19 +
.../local/utils/InputStreamToFileWriter.java | 5 +-
.../airavata/gfac/local/utils/InputUtils.java | 5 +-
.../gfac/local/utils/LocalProviderUtil.java | 19 +
.../gfac/monitor/cloud/AuroraJobMonitor.java | 243 +
.../gfac/monitor/email/EmailBasedMonitor.java | 121 +-
.../email/parser/AiravataCustomMailParser.java | 79 +
.../monitor/email/parser/LSFEmailParser.java | 45 +-
.../monitor/email/parser/PBSEmailParser.java | 34 +-
.../monitor/email/parser/SLURMEmailParser.java | 13 +-
.../monitor/email/parser/UGEEmailParser.java | 14 +-
.../exception/AiravataMonitorException.java | 5 +-
.../gfac/ssh/context/SSHAuthWrapper.java | 5 +-
.../gfac/ssh/security/SSHSecurityContext.java | 3 +-
.../gfac/ssh/security/TokenizedSSHAuthInfo.java | 5 +-
.../services/impl/BigRed2TestWithSSHAuth.java | 21 +-
.../gfac/services/impl/CredentialStoreTest.java | 19 +
.../impl/GSISSHProviderTestWithMyProxyAuth.java | 21 +-
.../gfac/services/impl/LocalProviderTest.java | 19 +
.../impl/SSHProviderTestWithSSHAuth.java | 21 +-
.../GSISecurityContextTestWithMyProxyAuth.java | 19 +
.../email/parser/PBSEmailParserTest.java | 52 +
.../gfac/ssh/config/ConfigReaderTest.java | 19 +
.../impl/DefaultSSHApiTestWithMyProxyAuth.java | 19 +
.../gfac/ssh/impl/VanilaTestWithSSHAuth.java | 19 +
.../apache/airavata/job/AMQPMonitorTest.java | 19 +
.../job/QstatMonitorTestWithMyProxyAuth.java | 19 +
modules/gfac/gfac-service/pom.xml | 31 +-
.../apache/airavata/gfac/server/GfacServer.java | 5 +-
.../airavata/gfac/server/GfacServerHandler.java | 101 +-
.../gfac/client/GfacClientFactoryTest.java | 6 +-
.../airavata/gfac/client/util/Initialize.java | 4 +-
modules/gfac/pom.xml | 26 +-
modules/group-manager/pom.xml | 58 -
.../internal/dao/PermissionEntryDAO.java | 286 -
.../dao/hib3/Hib3PermissionEntryDAO.java | 1123 -
.../grouper/permissions/PermissionFinder.java | 770 -
.../airavata/grouper/AiravataGrouperUtil.java | 35 -
.../airavata/grouper/GroupManagerCPI.java | 35 -
.../airavata/grouper/GroupManagerException.java | 36 -
.../airavata/grouper/GroupManagerFactory.java | 42 -
.../airavata/grouper/GroupManagerImpl.java | 118 -
.../apache/airavata/grouper/SubjectType.java | 14 -
.../apache/airavata/grouper/group/Group.java | 108 -
.../airavata/grouper/group/GroupMembership.java | 88 -
.../grouper/group/GroupMembershipType.java | 12 -
.../airavata/grouper/group/GroupService.java | 39 -
.../grouper/group/GroupServiceImpl.java | 412 -
.../grouper/permission/PermissionAction.java | 15 -
.../permission/PermissionServiceImpl.java | 86 -
.../airavata/grouper/resource/Resource.java | 145 -
.../resource/ResourceNotFoundException.java | 35 -
.../grouper/resource/ResourceServiceImpl.java | 343 -
.../airavata/grouper/resource/ResourceType.java | 51 -
.../airavata/grouper/role/RoleServiceImpl.java | 112 -
.../Owasp.CsrfGuard.overlay.properties | 78 -
.../main/resources/Owasp.CsrfGuard.properties | 403 -
.../group-manager/src/main/resources/README.txt | 21 -
.../src/main/resources/ehcache.xml | 1517 -
.../resources/grouper-loader.base.properties | 351 -
.../main/resources/grouper-loader.properties | 25 -
.../src/main/resources/grouper.base.properties | 1017 -
.../resources/grouper.client.base.properties | 552 -
.../main/resources/grouper.client.properties | 552 -
.../resources/grouper.hibernate.base.properties | 120 -
.../main/resources/grouper.hibernate.properties | 10 -
.../src/main/resources/grouper.properties | 1017 -
.../src/main/resources/grouperUtf8.txt | 1 -
.../src/main/resources/log4j.properties | 154 -
.../src/main/resources/morphString.properties | 21 -
.../src/main/resources/server.properties | 26 -
.../src/main/resources/sources.xml | 875 -
.../src/main/resources/spy.properties | 54 -
.../group-manager/src/main/resources/sqltool.rc | 6 -
.../src/main/resources/subject.base.properties | 46 -
.../src/main/resources/subject.properties | 27 -
modules/integration-tests/pom.xml | 26 +-
.../org/apache/airavata/integration/Man.java | 4 +-
.../integration/AbstractIntegrationTest.java | 4 +-
.../apache/airavata/integration/BaseCaseIT.java | 4 +-
.../airavata/integration/DataRetrievalIT.java | 4 +-
.../airavata/integration/ForEachCaseIT.java | 4 +-
.../apache/airavata/integration/OsUtils.java | 4 +-
.../integration/PasswordCallbackImpl.java | 19 +
.../airavata/integration/SimpleEchoIT.java | 4 +-
.../SingleAppIntegrationTestBase.java | 3 +-
.../WorkflowIntegrationTestBase.java | 4 +-
.../integration/WorkflowSamplesCaseIT.java | 4 +-
.../integration/tools/DocumentCreatorNew.java | 5 +-
.../integration/tools/DocumentCreatorUtils.java | 4 +-
.../integration-tests/src/test/java/suite.xml | 30 +-
modules/messaging/client/pom.xml | 26 +-
.../messaging/client/RabbitMQListener.java | 4 +-
.../airavata/messaging/client/TestReader.java | 3 +-
modules/messaging/core/pom.xml | 32 +-
.../airavata/messaging/core/MessageContext.java | 4 +-
.../airavata/messaging/core/MessageHandler.java | 4 +-
.../messaging/core/MessagingConstants.java | 4 +-
.../messaging/core/MessagingFactory.java | 33 +-
.../airavata/messaging/core/Publisher.java | 14 +-
.../messaging/core/PublisherFactory.java | 19 +
.../messaging/core/RabbitMQProperties.java | 3 +-
.../airavata/messaging/core/Subscriber.java | 6 +-
.../airavata/messaging/core/TestClient.java | 4 +-
.../apache/airavata/messaging/core/Type.java | 3 +-
.../messaging/core/impl/ExperimentConsumer.java | 3 +-
.../messaging/core/impl/MessageConsumer.java | 94 +
.../messaging/core/impl/ProcessConsumer.java | 3 +-
.../impl/RabbitMQProcessLaunchConsumer.java | 19 +
.../impl/RabbitMQProcessLaunchPublisher.java | 19 +
.../messaging/core/impl/RabbitMQProducer.java | 19 +
.../messaging/core/impl/RabbitMQPublisher.java | 40 +-
.../core/impl/RabbitMQStatusPublisher.java | 19 +
.../core/impl/RabbitMQStatusSubscriber.java | 19 +
.../messaging/core/impl/RabbitMQSubscriber.java | 4 +-
.../messaging/core/impl/StatusConsumer.java | 3 +-
.../messaging/core/stats/CountWriterTask.java | 3 +-
.../messaging/core/stats/LatencyWriterTask.java | 3 +-
.../messaging/core/stats/StatCounter.java | 3 +-
modules/messaging/pom.xml | 26 +-
modules/monitoring/pom.xml | 31 +-
.../org/apache/airavata/monitoring/Main.java | 3 +-
.../airavata/monitoring/MessageExtract.java | 3 +-
.../org/apache/airavata/monitoring/Util.java | 3 +-
.../monitoring/consumer/StatusConsumer.java | 3 +-
.../monitoring/consumer/StatusReceiver.java | 3 +-
.../monitoring/mailbox/GmailSMTPMailBox.java | 3 +-
.../airavata/monitoring/mailbox/MailBox.java | 3 +-
.../airavata/monitoring/mailbox/MailConfig.java | 3 +-
.../producer/RabbitMQEmailPublisher.java | 3 +-
.../monitoring/simulator/FetchPublish.java | 3 +-
.../monitoring/simulator/Simulator.java | 3 +-
modules/orchestrator/NULL | 1 -
.../orchestrator/orchestrator-client/pom.xml | 31 +-
.../client/OrchestratorClientFactory.java | 4 +-
.../orchestrator/cpi/OrchestratorService.java | 21 +-
.../cpi/orchestrator_cpiConstants.java | 19 +
.../sample/OrchestratorClientSample.java | 6 +-
modules/orchestrator/orchestrator-core/pom.xml | 31 +-
.../core/OrchestratorConfiguration.java | 5 +-
.../core/context/OrchestratorContext.java | 5 +-
.../core/exception/OrchestratorException.java | 5 +-
.../core/impl/GFACPassiveJobSubmitter.java | 5 +-
.../orchestrator/core/job/JobSubmitter.java | 5 +-
.../core/utils/OrchestratorConstants.java | 5 +-
.../core/utils/OrchestratorUtils.java | 250 +-
.../core/validator/JobMetadataValidator.java | 5 +-
.../validator/impl/BatchQueueValidator.java | 9 +-
.../impl/ExperimentStatusValidator.java | 5 +-
.../airavata/orchestrator/cpi/Orchestrator.java | 5 +-
.../cpi/impl/AbstractOrchestrator.java | 5 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 166 +-
.../orchestrator/core/BaseOrchestratorTest.java | 5 +-
.../orchestrator/core/NewOrchestratorTest.java | 5 +-
.../core/OrchestratorTestWithGRAM.java | 5 +-
.../core/OrchestratorTestWithMyProxyAuth.java | 5 +-
.../orchestrator/core/ValidatorTest.java | 19 +
.../orchestrator/core/util/Initialize.java | 4 +-
.../orchestrator/core/util/SecondValidator.java | 19 +
.../orchestrator/core/util/TestValidator.java | 19 +
.../orchestrator/orchestrator-service/pom.xml | 36 +-
.../orchestrator/server/OrchestratorServer.java | 24 +-
.../server/OrchestratorServerHandler.java | 109 +-
.../airavata/orchestrator/util/Constants.java | 4 +-
.../OrchestratorServerThreadPoolExecutor.java | 4 +-
.../orchestrator/util/OrchestratorUtils.java | 3 +-
.../client/OrchestratorClientFactoryTest.java | 6 +-
.../orchestrator/client/util/Initialize.java | 4 +-
modules/orchestrator/pom.xml | 26 +-
modules/registry-refactoring/pom.xml | 127 -
.../registry/core/RegistryException.java | 28 -
.../ComputeResourceSchedulingEntity.java | 170 -
.../entities/expcatalog/ExperimentEntity.java | 224 -
.../expcatalog/ExperimentErrorEntity.java | 118 -
.../entities/expcatalog/ExperimentErrorPK.java | 75 -
.../expcatalog/ExperimentInputEntity.java | 174 -
.../entities/expcatalog/ExperimentInputPK.java | 74 -
.../expcatalog/ExperimentOutputEntity.java | 165 -
.../entities/expcatalog/ExperimentOutputPK.java | 74 -
.../expcatalog/ExperimentStatusEntity.java | 83 -
.../entities/expcatalog/ExperimentStatusPK.java | 74 -
.../core/entities/expcatalog/JobEntity.java | 165 -
.../entities/expcatalog/JobStatusEntity.java | 83 -
.../core/entities/expcatalog/JobStatusPK.java | 74 -
.../core/entities/expcatalog/ProcessEntity.java | 276 -
.../entities/expcatalog/ProcessErrorEntity.java | 118 -
.../entities/expcatalog/ProcessErrorPK.java | 75 -
.../entities/expcatalog/ProcessInputEntity.java | 174 -
.../entities/expcatalog/ProcessInputPK.java | 74 -
.../expcatalog/ProcessOutputEntity.java | 165 -
.../entities/expcatalog/ProcessOutputPK.java | 70 -
.../ProcessResourceSchedulingEntity.java | 170 -
.../expcatalog/ProcessStatusEntity.java | 83 -
.../entities/expcatalog/ProcessStatusPK.java | 74 -
.../core/entities/expcatalog/TaskEntity.java | 147 -
.../entities/expcatalog/TaskErrorEntity.java | 118 -
.../core/entities/expcatalog/TaskErrorPK.java | 75 -
.../entities/expcatalog/TaskStatusEntity.java | 83 -
.../core/entities/expcatalog/TaskStatusPK.java | 74 -
.../expcatalog/UserConfigurationEntity.java | 131 -
.../workspacecatalog/GatewayEntity.java | 221 -
.../workspacecatalog/NSFDemographicsEntity.java | 94 -
.../workspacecatalog/NotificationEntity.java | 110 -
.../workspacecatalog/ProjectEntity.java | 92 -
.../workspacecatalog/UserProfileEntity.java | 247 -
.../core/repositories/AbstractRepository.java | 98 -
.../expcatalog/ExperimentRepository.java | 101 -
.../ComponentStatusRepository.java | 37 -
.../workflowcatalog/EdgeRepository.java | 38 -
.../workflowcatalog/WorkflowRepository.java | 37 -
.../workspacecatalog/GatewayRepository.java | 36 -
.../NotificationRepository.java | 35 -
.../workspacecatalog/ProjectRepository.java | 35 -
.../workspacecatalog/UserProfileRepository.java | 88 -
.../airavata/registry/core/utils/Committer.java | 27 -
.../airavata/registry/core/utils/JPAUtils.java | 82 -
.../core/utils/ObjectMapperSingleton.java | 39 -
.../src/main/resources/META-INF/persistence.xml | 131 -
.../src/main/resources/experiment_catalog.sql | 285 -
.../src/main/resources/workspace_catalog.sql | 125 -
modules/registry/pom.xml | 26 +-
modules/registry/registry-core/pom.xml | 58 +-
.../core/app/catalog/impl/AppCatalogImpl.java | 9 +-
.../catalog/impl/ApplicationDeploymentImpl.java | 14 +-
.../catalog/impl/ApplicationInterfaceImpl.java | 6 +-
.../app/catalog/impl/ComputeResourceImpl.java | 58 +-
.../catalog/impl/GwyResourceProfileImpl.java | 4 +-
.../app/catalog/impl/StorageResourceImpl.java | 4 +-
.../catalog/impl/UsrResourceProfileImpl.java | 367 +
.../core/app/catalog/model/AppEnvironment.java | 4 +-
.../app/catalog/model/AppEnvironment_PK.java | 4 +-
.../core/app/catalog/model/AppInput_PK.java | 4 +-
.../app/catalog/model/AppModuleMapping.java | 4 +-
.../app/catalog/model/AppModuleMapping_PK.java | 4 +-
.../core/app/catalog/model/AppOutput_PK.java | 4 +-
.../catalog/model/ApplicationDeployment.java | 56 +-
.../app/catalog/model/ApplicationIntInput.java | 15 +-
.../app/catalog/model/ApplicationIntOutput.java | 4 +-
.../app/catalog/model/ApplicationInterface.java | 4 +-
.../app/catalog/model/ApplicationModule.java | 4 +-
.../core/app/catalog/model/BatchQueue.java | 48 +-
.../core/app/catalog/model/BatchQueue_PK.java | 4 +-
.../app/catalog/model/CloudJobSubmission.java | 5 +-
.../core/app/catalog/model/ComputeResource.java | 48 +-
.../model/ComputeResourceFileSystem.java | 4 +-
.../model/ComputeResourceFileSystem_PK.java | 4 +-
.../model/ComputeResourcePreference.java | 4 +-
.../model/ComputeResourcePreferencePK.java | 4 +-
.../core/app/catalog/model/Configuration.java | 19 +
.../app/catalog/model/Configuration_PK.java | 4 +-
.../catalog/model/DataMovementInterface.java | 4 +-
.../catalog/model/DataMovementInterface_PK.java | 4 +-
.../app/catalog/model/DataStorageResource.java | 4 +-
.../core/app/catalog/model/GSISSHExport.java | 4 +-
.../core/app/catalog/model/GSISSHExportPK.java | 4 +-
.../app/catalog/model/GSISSHSubmission.java | 4 +-
.../core/app/catalog/model/GatewayProfile.java | 4 +-
.../app/catalog/model/GlobusGKEndPointPK.java | 4 +-
.../app/catalog/model/GlobusGKEndpoint.java | 4 +-
.../app/catalog/model/GlobusJobSubmission.java | 4 +-
.../app/catalog/model/GridftpDataMovement.java | 4 +-
.../core/app/catalog/model/GridftpEndpoint.java | 4 +-
.../app/catalog/model/GridftpEndpoint_PK.java | 4 +-
.../core/app/catalog/model/HostAlias.java | 4 +-
.../core/app/catalog/model/HostAliasPK.java | 4 +-
.../core/app/catalog/model/HostIPAddress.java | 4 +-
.../core/app/catalog/model/HostIPAddressPK.java | 4 +-
.../app/catalog/model/JobManagerCommand.java | 4 +-
.../app/catalog/model/JobManagerCommand_PK.java | 4 +-
.../catalog/model/JobSubmissionInterface.java | 4 +-
.../model/JobSubmissionInterface_PK.java | 4 +-
.../app/catalog/model/LibraryApendPath.java | 4 +-
.../app/catalog/model/LibraryApendPath_PK.java | 4 +-
.../app/catalog/model/LibraryPrepandPath.java | 4 +-
.../catalog/model/LibraryPrepandPath_PK.java | 4 +-
.../app/catalog/model/LocalDataMovement.java | 4 +-
.../core/app/catalog/model/LocalSubmission.java | 15 +-
.../core/app/catalog/model/ModuleLoadCmd.java | 4 +-
.../app/catalog/model/ModuleLoadCmd_PK.java | 4 +-
.../catalog/model/ParallelismPrefixCommand.java | 4 +-
.../model/ParallelismPrefixCommand_PK.java | 4 +-
.../core/app/catalog/model/PostJobCommand.java | 4 +-
.../app/catalog/model/PostJobCommandPK.java | 4 +-
.../core/app/catalog/model/PreJobCommand.java | 4 +-
.../core/app/catalog/model/PreJobCommandPK.java | 4 +-
.../app/catalog/model/ResourceJobManager.java | 4 +-
.../core/app/catalog/model/ScpDataMovement.java | 4 +-
.../app/catalog/model/SshJobSubmission.java | 4 +-
.../app/catalog/model/StorageInterface.java | 4 +-
.../app/catalog/model/StorageInterface_PK.java | 4 +-
.../app/catalog/model/StoragePreference.java | 4 +-
.../app/catalog/model/StoragePreferencePK.java | 4 +-
.../core/app/catalog/model/StorageResource.java | 4 +-
.../app/catalog/model/UnicoreDataMovement.java | 6 +-
.../app/catalog/model/UnicoreJobSubmission.java | 6 +-
.../model/UserComputeResourcePreference.java | 187 +
.../model/UserComputeResourcePreferencePK.java | 77 +
.../app/catalog/model/UserResourceProfile.java | 110 +
.../catalog/model/UserResourceProfilePK.java | 76 +
.../catalog/model/UserStoragePreference.java | 107 +
.../catalog/model/UserStoragePreferencePK.java | 78 +
.../resources/AppCatAbstractResource.java | 30 +-
.../catalog/resources/AppCatalogResource.java | 19 +
.../resources/AppDeploymentResource.java | 59 +-
.../resources/AppEnvironmentResource.java | 4 +-
.../catalog/resources/AppInterfaceResource.java | 4 +-
...ppModuleMappingAppCatalogResourceAppCat.java | 4 +-
.../catalog/resources/AppModuleResource.java | 4 +-
.../resources/ApplicationInputResource.java | 12 +-
.../resources/ApplicationOutputResource.java | 2 +-
.../catalog/resources/BatchQueueResource.java | 60 +-
.../resources/CloudSubmissionResource.java | 5 +-
.../ComputeHostPreferenceResource.java | 8 +-
.../ComputeResourceFileSystemResource.java | 4 +-
.../resources/ComputeResourceResource.java | 46 +-
.../DataMovementInterfaceResource.java | 4 +-
.../catalog/resources/GSISSHExportResource.java | 2 +-
.../resources/GSISSHSubmissionResource.java | 2 +-
.../resources/GatewayProfileResource.java | 2 +-
.../resources/GlobusGKEndpointResource.java | 2 +-
.../resources/GlobusJobSubmissionResource.java | 2 +-
.../resources/GridftpDataMovementResource.java | 2 +-
.../resources/GridftpEndpointResource.java | 2 +-
.../catalog/resources/HostAliasAppResource.java | 2 +-
.../resources/HostIPAddressResource.java | 2 +-
.../resources/JobManagerCommandResource.java | 4 +-
.../JobSubmissionInterfaceResource.java | 4 +-
.../resources/LibraryApendPathResource.java | 4 +-
.../resources/LibraryPrepandPathResource.java | 4 +-
.../resources/LocalDataMovementResource.java | 4 +-
.../resources/LocalSubmissionResource.java | 16 +-
.../resources/ModuleLoadCmdResource.java | 4 +-
.../ParallelismPrefixCommandResource.java | 4 +-
.../resources/PostJobCommandResource.java | 2 +-
.../resources/PreJobCommandResource.java | 2 +-
.../resources/ResourceJobManagerResource.java | 4 +-
.../resources/ScpDataMovementResource.java | 2 +-
.../resources/SshJobSubmissionResource.java | 2 +-
.../resources/StorageInterfaceResource.java | 4 +-
.../resources/StoragePreferenceResource.java | 4 +-
.../resources/StorageResourceResource.java | 4 +-
.../resources/UnicoreDataMovementResource.java | 6 +-
.../resources/UnicoreJobSubmissionResource.java | 6 +-
.../UserComputeHostPreferenceResource.java | 456 +
.../resources/UserResourceProfileResource.java | 455 +
.../UserStoragePreferenceResource.java | 381 +
.../app/catalog/util/AppCatalogJPAUtils.java | 111 +-
.../catalog/util/AppCatalogQueryGenerator.java | 4 +-
.../catalog/util/AppCatalogResourceType.java | 7 +-
.../util/AppCatalogThriftConversion.java | 102 +-
.../core/app/catalog/util/AppCatalogUtils.java | 4 +-
.../experiment/catalog/ExpCatResourceUtils.java | 17 +-
.../catalog/ExperimentCatResource.java | 5 +-
.../core/experiment/catalog/JPAConstants.java | 4 +-
.../core/experiment/catalog/ResourceType.java | 8 +-
.../catalog/impl/ExperimentCatalogImpl.java | 25 +-
.../catalog/impl/ExperimentRegistry.java | 91 +-
.../catalog/impl/GatewayRegistry.java | 4 +-
.../catalog/impl/NotificationRegistry.java | 6 +-
.../catalog/impl/ProjectRegistry.java | 48 +-
.../catalog/impl/RegistryFactory.java | 4 +-
.../experiment/catalog/impl/UserRegistry.java | 4 +-
.../experiment/catalog/model/Experiment.java | 5 +-
.../catalog/model/ExperimentError.java | 5 +-
.../catalog/model/ExperimentErrorPK.java | 5 +-
.../catalog/model/ExperimentInput.java | 15 +-
.../catalog/model/ExperimentInputPK.java | 5 +-
.../catalog/model/ExperimentOutput.java | 5 +-
.../catalog/model/ExperimentOutputPK.java | 5 +-
.../catalog/model/ExperimentStatus.java | 5 +-
.../catalog/model/ExperimentStatusPK.java | 5 +-
.../catalog/model/ExperimentSummary.java | 5 +-
.../core/experiment/catalog/model/Gateway.java | 5 +-
.../experiment/catalog/model/GatewayWorker.java | 5 +-
.../catalog/model/GatewayWorkerPK.java | 5 +-
.../core/experiment/catalog/model/Job.java | 5 +-
.../core/experiment/catalog/model/JobPK.java | 5 +-
.../experiment/catalog/model/JobStatus.java | 5 +-
.../experiment/catalog/model/JobStatusPK.java | 5 +-
.../experiment/catalog/model/Notification.java | 5 +-
.../core/experiment/catalog/model/Process.java | 15 +-
.../experiment/catalog/model/ProcessError.java | 5 +-
.../catalog/model/ProcessErrorPK.java | 5 +-
.../experiment/catalog/model/ProcessInput.java | 14 +-
.../catalog/model/ProcessInputPK.java | 5 +-
.../experiment/catalog/model/ProcessOutput.java | 5 +-
.../catalog/model/ProcessOutputPK.java | 5 +-
.../catalog/model/ProcessResourceSchedule.java | 5 +-
.../experiment/catalog/model/ProcessStatus.java | 5 +-
.../catalog/model/ProcessStatusPK.java | 5 +-
.../core/experiment/catalog/model/Project.java | 5 +-
.../experiment/catalog/model/ProjectUser.java | 5 +-
.../experiment/catalog/model/ProjectUserPK.java | 5 +-
.../experiment/catalog/model/QueueStatus.java | 98 +
.../experiment/catalog/model/QueueStatusPK.java | 87 +
.../core/experiment/catalog/model/Task.java | 5 +-
.../experiment/catalog/model/TaskError.java | 5 +-
.../experiment/catalog/model/TaskErrorPK.java | 5 +-
.../experiment/catalog/model/TaskStatus.java | 5 +-
.../experiment/catalog/model/TaskStatusPK.java | 5 +-
.../catalog/model/UserConfigurationData.java | 14 +-
.../core/experiment/catalog/model/UserPK.java | 5 +-
.../core/experiment/catalog/model/Users.java | 5 +-
.../resources/AbstractExpCatResource.java | 3 +-
.../resources/ExperimentErrorResource.java | 4 +-
.../resources/ExperimentInputResource.java | 14 +-
.../resources/ExperimentOutputResource.java | 4 +-
.../catalog/resources/ExperimentResource.java | 4 +-
.../resources/ExperimentStatisticsResource.java | 5 +-
.../resources/ExperimentStatusResource.java | 4 +-
.../resources/ExperimentSummaryResource.java | 5 +-
.../catalog/resources/GatewayResource.java | 5 +-
.../catalog/resources/JobResource.java | 4 +-
.../catalog/resources/JobStatusResource.java | 4 +-
.../catalog/resources/NotificationResource.java | 5 +-
.../catalog/resources/ProcessErrorResource.java | 4 +-
.../catalog/resources/ProcessInputResource.java | 14 +-
.../resources/ProcessOutputResource.java | 4 +-
.../catalog/resources/ProcessResource.java | 15 +-
.../ProcessResourceScheduleResource.java | 4 +-
.../resources/ProcessStatusResource.java | 4 +-
.../catalog/resources/ProjectResource.java | 5 +-
.../catalog/resources/ProjectUserResource.java | 4 +-
.../catalog/resources/QueueStatusResource.java | 207 +
.../catalog/resources/TaskErrorResource.java | 4 +-
.../catalog/resources/TaskResource.java | 4 +-
.../catalog/resources/TaskStatusResource.java | 4 +-
.../UserConfigurationDataResource.java | 14 +-
.../catalog/resources/UserResource.java | 5 +-
.../experiment/catalog/resources/Utils.java | 7 +-
.../catalog/resources/WorkerResource.java | 54 +-
.../catalog/utils/QueryGenerator.java | 4 +-
.../utils/ThriftDataModelConversion.java | 25 +-
.../registry/core/impl/RegistryImpl.java | 6 +-
.../catalog/impl/ReplicaCatalogImpl.java | 48 +-
.../replica/catalog/model/Configuration.java | 20 +-
.../replica/catalog/model/Configuration_PK.java | 63 +
.../core/replica/catalog/model/DataProduct.java | 5 +-
.../catalog/model/DataProductMetaData.java | 5 +-
.../catalog/model/DataProductMetaData_PK.java | 5 +-
.../catalog/model/DataReplicaLocation.java | 5 +-
.../catalog/model/DataReplicaMetaData.java | 5 +-
.../catalog/model/DataReplicaMetaData_PK.java | 5 +-
.../catalog/utils/ReplicaCatalogConstants.java | 3 +-
.../catalog/utils/ReplicaCatalogJPAUtils.java | 4 +-
.../utils/ReplicaCatalogQueryGenerator.java | 4 +-
.../utils/ThriftDataModelConversion.java | 19 +
.../catalog/impl/WorkflowCatalogImpl.java | 4 +-
.../workflow/catalog/model/ComponentStatus.java | 4 +-
.../core/workflow/catalog/model/Edge.java | 4 +-
.../core/workflow/catalog/model/Edge_PK.java | 4 +-
.../core/workflow/catalog/model/Node.java | 4 +-
.../core/workflow/catalog/model/Node_PK.java | 4 +-
.../core/workflow/catalog/model/Port.java | 4 +-
.../core/workflow/catalog/model/Port_PK.java | 4 +-
.../core/workflow/catalog/model/Workflow.java | 4 +-
.../workflow/catalog/model/WorkflowInput.java | 4 +-
.../catalog/model/WorkflowInput_PK.java | 4 +-
.../workflow/catalog/model/WorkflowOutput.java | 4 +-
.../catalog/model/WorkflowOutput_PK.java | 4 +-
.../workflow/catalog/model/WorkflowStatus.java | 4 +-
.../catalog/model/WorkflowStatus_PK.java | 4 +-
.../resources/ComponentStatusResource.java | 2 +-
.../catalog/resources/EdgeResource.java | 2 +-
.../catalog/resources/NodeResource.java | 2 +-
.../catalog/resources/PortResource.java | 2 +-
.../resources/WorkflowCatAbstractResource.java | 4 +-
.../resources/WorkflowCatalogResource.java | 19 +
.../resources/WorkflowInputResource.java | 2 +-
.../resources/WorkflowOutputResource.java | 2 +-
.../catalog/resources/WorkflowResource.java | 4 +-
.../resources/WorkflowStatusResource.java | 2 +-
.../catalog/utils/WorkflowCatalogJPAUtils.java | 4 +-
.../utils/WorkflowCatalogQueryGenerator.java | 4 +-
.../utils/WorkflowCatalogResourceType.java | 4 +-
.../utils/WorkflowCatalogThriftConversion.java | 4 +-
.../catalog/utils/WorkflowCatalogUtils.java | 4 +-
.../src/main/resources/META-INF/persistence.xml | 6 +
.../src/main/resources/appcatalog-derby.sql | 15 +
.../src/main/resources/appcatalog-mysql.sql | 15 +
.../src/main/resources/credstore-derby.sql | 60 +-
.../src/main/resources/credstore-mysql.sql | 60 +-
.../src/main/resources/expcatalog-derby.sql | 13 +
.../src/main/resources/expcatalog-mysql.sql | 12 +
.../main/resources/workflowcatalog-mysql.sql | 3 +-
.../airavata/app/catalog/AppDeploymentTest.java | 4 +-
.../airavata/app/catalog/AppInterfaceTest.java | 4 +-
...puteAppCatalogExperimentCatResourceTest.java | 4 +-
.../app/catalog/GatewayProfileTest.java | 4 +-
.../catalog/StorageResourceAppCatalogTest.java | 4 +-
.../app/catalog/UserResourceProfileTest.java | 187 +
.../airavata/app/catalog/util/Initialize.java | 4 +-
.../catalog/AbstractResourceTest.java | 4 +-
.../catalog/ExperimentInputResourceTest.java | 20 +
.../catalog/ExperimentOutputResourceTest.java | 19 +
.../catalog/ExperimentResourceTest.java | 19 +
.../experiment/catalog/GatewayResourceTest.java | 19 +
.../experiment/catalog/JobResourceTest.java | 2 +-
.../experiment/catalog/ProcessResourceTest.java | 2 +-
.../catalog/QueueStatusResourceTest.java | 95 +
.../experiment/catalog/TaskResourceTest.java | 2 +-
.../catalog/UserConfigurationDataTest.java | 4 +-
.../experiment/catalog/UserResourceTest.java | 19 +
.../experiment/catalog/util/Initialize.java | 4 +-
.../replica/catalog/ReplicaCatalogTest.java | 7 +-
.../replica/catalog/util/Initialize.java | 4 +-
modules/registry/registry-cpi/pom.xml | 26 +-
.../airavata/registry/cpi/AppCatalog.java | 9 +-
.../registry/cpi/AppCatalogException.java | 2 +-
.../registry/cpi/ApplicationDeployment.java | 2 +-
.../registry/cpi/ApplicationInterface.java | 2 +-
.../registry/cpi/CompositeIdentifier.java | 16 +-
.../airavata/registry/cpi/ComputeResource.java | 2 +-
.../registry/cpi/ExpCatChildDataType.java | 2 +-
.../registry/cpi/ExpCatParentDataType.java | 5 +-
.../registry/cpi/ExperimentCatalog.java | 2 +-
.../cpi/ExperimentCatalogException.java | 6 +-
.../cpi/ExperimentCatalogModelType.java | 5 +-
.../registry/cpi/GwyClientCredential.java | 2 +-
.../registry/cpi/GwyResourceProfile.java | 2 +-
.../apache/airavata/registry/cpi/Registry.java | 6 +-
.../registry/cpi/RegistryException.java | 4 +-
.../airavata/registry/cpi/ReplicaCatalog.java | 5 +-
.../registry/cpi/ReplicaCatalogException.java | 2 +-
.../airavata/registry/cpi/ResultOrderType.java | 19 +
.../airavata/registry/cpi/StorageResource.java | 8 +-
.../registry/cpi/UsrResourceProfile.java | 90 +
.../airavata/registry/cpi/WorkflowCatalog.java | 6 +-
.../registry/cpi/WorkflowCatalogException.java | 2 +-
.../airavata/registry/cpi/utils/Constants.java | 5 +-
.../airavata/registry/cpi/utils/StatusType.java | 2 +-
modules/registry/registry-server/pom.xml | 28 +-
.../registry-api-service/pom.xml | 26 +
.../registry/api/service/RegistryAPIServer.java | 36 +-
.../service/handler/RegistryServerHandler.java | 678 +-
.../RegistryServiceDBEventHandler.java | 159 +
.../RegistryServiceDBEventMessagingFactory.java | 94 +
.../api/service/util/AppCatalogInitUtil.java | 19 +
.../api/service/util/ConnectionPool.java | 6 +-
.../registry/api/service/util/Constants.java | 14 +-
.../api/service/util/DatabaseCreator.java | 41 +-
.../service/util/ExperimentCatalogInitUtil.java | 21 +
.../registry/api/service/util/JdbcStorage.java | 5 +-
.../service/util/ReplicaCatalogInitUtil.java | 19 +
.../service/util/WorkflowCatalogInitUtil.java | 19 +
.../registry-server/registry-api-stubs/pom.xml | 21 +
.../airavata/registry/api/RegistryService.java | 39074 ++++--
.../client/RegistryServiceClientFactory.java | 4 +-
.../api/exception/RegistryServiceException.java | 21 +-
.../registry/api/registry_apiConstants.java | 19 +
modules/registry/registry-tools/jpa-gen/pom.xml | 26 +-
.../computeresource/BatchQueueGenerator.java | 4 +-
.../ComputeResourceDescriptionGenerator.java | 4 +-
.../DataMovementInterfaceGenerator.java | 4 +-
.../computeresource/FileSystemsGenerator.java | 4 +-
.../GridFTPDataMovementGenerator.java | 4 +-
.../GridFTPEndpointsGenerator.java | 4 +-
.../JobManagerCommandGenerator.java | 4 +-
.../JobSubmissionInterfaceGenerator.java | 4 +-
.../LocalDataMovementGenerator.java | 4 +-
.../LocalSubmissionGenerator.java | 4 +-
.../computeresource/ModuleCMDGenerator.java | 4 +-
.../ResourceJobManagerGenerator.java | 4 +-
.../SCPDataMovementGenerator.java | 4 +-
.../SSHJobSubmissionGenerator.java | 4 +-
.../main/java/generators/AbstractGenerator.java | 19 +
.../main/java/generators/JPAClassGenerator.java | 19 +
.../generators/JPAResourceClassGenerator.java | 19 +
.../src/main/java/generators/SQLGenerator.java | 19 +
.../src/main/java/model/JPAClassField.java | 19 +
.../src/main/java/model/JPAClassModel.java | 19 +
.../src/main/java/model/JPAPKClassModel.java | 19 +
.../main/java/model/JPAResourceClassModel.java | 19 +
.../jpa-gen/src/main/java/model/SQLData.java | 19 +
.../jpa-gen/src/main/java/test/Test.java | 19 +
modules/registry/registry-tools/pom.xml | 26 +-
.../registry-tools/registry-tool/pom.xml | 26 +-
.../airavata/registry/tool/DBMigrator.java | 4 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 84 +
.../credentialStore_schema_delta.sql | 37 +
.../DeltaScripts/expCatalog_schema_delta.sql | 54 +
.../replicaCatalog_schema_delta.sql | 32 +
.../DeltaScripts/workFlow_schema_delta.sql | 31 +
.../0.16-0.17/migration-notes.md | 10 +
modules/security/pom.xml | 30 +-
.../security/AbstractAuthenticator.java | 4 +-
.../security/AbstractDatabaseAuthenticator.java | 4 +-
.../security/AiravataSecurityException.java | 3 +-
.../security/AuthenticationException.java | 4 +-
.../apache/airavata/security/Authenticator.java | 4 +-
.../apache/airavata/security/Authoriser.java | 4 +-
.../org/apache/airavata/security/UserStore.java | 4 +-
.../airavata/security/UserStoreException.java | 4 +-
.../AbstractConfigurationReader.java | 4 +-
.../AuthenticatorConfigurationReader.java | 4 +-
.../userstore/AbstractJDBCUserStore.java | 4 +-
.../security/userstore/JDBCUserStore.java | 4 +-
.../security/userstore/LDAPUserStore.java | 4 +-
.../security/userstore/SessionDBUserStore.java | 4 +-
.../security/util/PasswordDigester.java | 4 +-
.../security/util/TrustStoreManager.java | 3 +-
.../AuthenticatorConfigurationReaderTest.java | 4 +-
.../configurations/TestDBAuthenticator1.java | 4 +-
.../configurations/TestDBAuthenticator2.java | 4 +-
.../configurations/TestDBAuthenticator3.java | 4 +-
.../security/configurations/TestUserStore.java | 36 +-
.../security/userstore/JDBCUserStoreTest.java | 36 +-
.../security/userstore/LDAPUserStoreTest.java | 36 +-
.../userstore/SessionDBUserStoreTest.java | 36 +-
modules/server/pom.xml | 30 +-
.../org/apache/airavata/server/ServerMain.java | 53 +-
modules/sharing-registry/README.md | 3 +
modules/sharing-registry/pom.xml | 46 +
.../sharing-data-migrator/pom.xml | 88 +
.../migrator/airavata/AiravataDataMigrator.java | 186 +
.../migrator/airavata/ConnectionFactory.java | 58 +
.../sharing-registry-distribution/pom.xml | 110 +
.../src/main/assembly/bin-assembly.xml | 73 +
.../src/main/resources/bin/setenv.sh | 61 +
.../src/main/resources/bin/sharing-registry.sh | 90 +
.../sharing-registry-server/pom.xml | 144 +
.../registry/db/entities/DomainEntity.java | 116 +
.../registry/db/entities/EntityEntity.java | 219 +
.../sharing/registry/db/entities/EntityPK.java | 76 +
.../registry/db/entities/EntityTypeEntity.java | 130 +
.../registry/db/entities/EntityTypePK.java | 76 +
.../db/entities/GroupMembershipEntity.java | 126 +
.../registry/db/entities/GroupMembershipPK.java | 88 +
.../db/entities/PermissionTypeEntity.java | 128 +
.../registry/db/entities/PermissionTypePK.java | 76 +
.../registry/db/entities/SharingEntity.java | 149 +
.../sharing/registry/db/entities/SharingPK.java | 116 +
.../registry/db/entities/UserEntity.java | 161 +
.../registry/db/entities/UserGroupEntity.java | 166 +
.../registry/db/entities/UserGroupPK.java | 75 +
.../sharing/registry/db/entities/UserPK.java | 75 +
.../db/repositories/AbstractRepository.java | 157 +
.../db/repositories/DomainRepository.java | 33 +
.../db/repositories/EntityRepository.java | 182 +
.../db/repositories/EntityTypeRepository.java | 34 +
.../repositories/GroupMembershipRepository.java | 80 +
.../repositories/PermissionTypeRepository.java | 52 +
.../db/repositories/SharingRepository.java | 93 +
.../db/repositories/UserGroupRepository.java | 68 +
.../db/repositories/UserRepository.java | 57 +
.../sharing/registry/db/utils/Committer.java | 26 +
.../registry/db/utils/ConnectionPool.java | 381 +
.../sharing/registry/db/utils/DBConstants.java | 106 +
.../registry/db/utils/DatabaseCreator.java | 352 +
.../sharing/registry/db/utils/JPAUtils.java | 215 +
.../sharing/registry/db/utils/JdbcStorage.java | 174 +
.../db/utils/ObjectMapperSingleton.java | 38 +
.../messaging/SharingServiceDBEventHandler.java | 243 +
.../SharingServiceDBEventMessagingFactory.java | 111 +
.../sharing/registry/server/ServerMain.java | 101 +
.../registry/server/SharingRegistryServer.java | 166 +
.../server/SharingRegistryServerHandler.java | 1067 +
.../sharing/registry/utils/Constants.java | 38 +
.../utils/ThriftDataModelConversion.java | 28 +
.../src/main/resources/META-INF/persistence.xml | 15 +
.../main/resources/sharing-registry-derby.sql | 139 +
.../main/resources/sharing-registry-mysql.sql | 139 +
.../airavata/sharing/registry/CipresTest.java | 615 +
.../SharingRegistryServerHandlerTest.java | 286 +
.../registry/SharingRegistryServiceTest.java | 361 +
.../sharing/registry/util/Initialize.java | 296 +
.../sharing-registry-stubs/pom.xml | 85 +
.../SharingRegistryServiceClientFactory.java | 44 +
.../sharing/registry/models/Domain.java | 847 +
.../sharing/registry/models/Entity.java | 1704 +
.../registry/models/EntitySearchField.java | 100 +
.../sharing/registry/models/EntityType.java | 950 +
.../registry/models/GroupCardinality.java | 69 +
.../sharing/registry/models/GroupChildType.java | 68 +
.../registry/models/GroupMembership.java | 960 +
.../sharing/registry/models/GroupType.java | 68 +
.../sharing/registry/models/PermissionType.java | 950 +
.../registry/models/SearchCondition.java | 85 +
.../sharing/registry/models/SearchCriteria.java | 668 +
.../sharing/registry/models/Sharing.java | 1174 +
.../models/SharingRegistryException.java | 414 +
.../sharing/registry/models/SharingType.java | 71 +
.../airavata/sharing/registry/models/User.java | 1285 +
.../sharing/registry/models/UserGroup.java | 1306 +
.../models/sharing_modelsConstants.java | 60 +
.../service/cpi/SharingRegistryService.java | 55834 ++++++++
.../sharing-service-docs/api-docs/index.html | 225 +
.../api-docs/sharing_cpi.html | 352 +
.../api-docs/sharing_models.html | 312 +
.../sharing-service-docs/api-docs/style.css | 194 +
.../sharing-service-docs/index.html | 389 +
.../sharing-service-docs/sharing_overview.png | Bin 0 -> 49205 bytes
.../sharing-service-docs/style.css | 194 +
.../thrift_models/sharing_cpi.thrift | 236 +
.../thrift_models/sharing_models.thrift | 279 +
.../thrift_models/thrift-gen.sh | 42 +
modules/simstream/README.md | 18 -
modules/simstream/example/README.md | 9 -
.../simstream/example/logfile_checker/README.md | 23 -
.../example/logfile_checker/generate_logs.sh | 22 -
.../example/logfile_checker/log_consumer.py | 43 -
.../example/logfile_checker/log_streamer.py | 111 -
.../example/logfile_checker/remote_log.slurm | 21 -
.../simstream/example/logfile_checker/test.txt | 657 -
.../simstream/example/mem_streamer/README.md | 17 -
.../example/mem_streamer/memory_consumption.py | 83 -
.../example/mem_streamer/memory_streamer.py | 46 -
.../simstream/example/openmm_example/README.md | 33 -
.../application/alanine_dipeptide.py | 55 -
.../openmm_example/application/input.pdb | 24 -
.../openmm_example/application/trajectory.dcd | 0
.../example/openmm_example/openmm_consumer.py | 8 -
.../openmm_example/openmm_log_consumer.py | 32 -
.../openmm_example/openmm_rmsd_consumer.py | 36 -
.../example/openmm_example/openmm_stream.slurm | 19 -
.../example/openmm_example/openmm_streamer.py | 130 -
.../simstream/example/openmm_example/test.txt | 0
modules/simstream/example/settings.json | 6 -
modules/simstream/setup.py | 19 -
modules/simstream/simstream/__init__.py | 11 -
modules/simstream/simstream/datacollector.py | 110 -
modules/simstream/simstream/datareporter.py | 169 -
modules/simstream/simstream/eventhandler.py | 17 -
modules/simstream/simstream/eventmonitor.py | 46 -
.../simstream/simstream/pikaasyncconsumer.py | 203 -
modules/simstream/simstream/pikaproducer.py | 202 -
modules/simstream/simstream/simstream.py | 167 -
.../test-suite/multi-tenanted-airavata/README | 59 +-
.../test-suite/multi-tenanted-airavata/pom.xml | 198 +-
.../multitenantedairavata/AiravataClient.java | 10 +-
.../multitenantedairavata/AiravataIT.java | 378 +
.../ApplicationRegister.java | 331 +-
.../ComputeResourceRegister.java | 169 +-
.../ExperimentExecution.java | 569 +-
.../FrameworkBootstrapping.java | 621 +-
.../multitenantedairavata/FrameworkSetup.java | 16 +-
.../multitenantedairavata/GatewayRegister.java | 143 +-
.../StorageResourceRegister.java | 170 +
.../TestFrameworkProps.java | 14 +-
.../utils/ApplicationProperties.java | 58 +
.../utils/ComputeResourceProperties.java | 54 +
.../utils/FrameworkUtils.java | 6 +-
.../utils/PropertyFileType.java | 8 +-
.../utils/PropertyReader.java | 13 +-
.../utils/TestFrameworkConstants.java | 103 +-
.../main/resources/airavata-client.properties | 55 -
.../src/main/resources/airavata-server-stop.sh | 71 +
.../main/resources/airavata-server.properties | 346 +
.../src/main/resources/airavata_sym.jks | Bin 0 -> 501 bytes
.../local-exp-resources/wrapper/echo_wrapper.sh | 7 +
.../src/main/resources/log4j.properties | 41 +
.../src/main/resources/startup-airavata.sh | 8 +
.../src/main/resources/test-framework.json | 67 +-
.../main/resources/test-framework.properties | 45 -
.../src/main/resources/test-framework.yaml | 49 -
modules/test-suite/pom.xml | 28 +-
modules/user-profile-migration/pom.xml | 129 +
.../airavata/KeycloakIdentityServerClient.java | 77 +
.../org/apache/airavata/MigrationManager.java | 149 +
.../UserProfileAiravataThriftClient.java | 44 +
.../org/apache/airavata/UserProfileDAO.java | 118 +
.../airavata/Wso2ISLoginCredentialsDAO.java | 78 +
.../airavata/Wso2IdentityServerClient.java | 137 +
modules/user-profile/pom.xml | 30 -
modules/user-profile/user-profile-core/pom.xml | 88 -
modules/user-profile/user-profile-stubs/pom.xml | 35 -
modules/workflow-model/pom.xml | 26 +-
modules/workflow-model/workflow-engine/pom.xml | 26 +-
.../catalog/WorkflowCatalogFactory.java | 4 +-
.../workflow/engine/WorkflowEngine.java | 4 +-
.../engine/WorkflowEngineException.java | 4 +-
.../workflow/engine/WorkflowEngineFactory.java | 4 +-
.../workflow/engine/WorkflowEngineImpl.java | 4 +-
.../airavata/workflow/engine/WorkflowUtils.java | 4 +-
.../engine/concurrent/PredicatedExecutable.java | 5 +-
.../engine/concurrent/PredicatedTaskRunner.java | 5 +-
.../engine/core/amazon/AmazonCredential.java | 4 +-
.../engine/core/amazon/EC2InstanceResult.java | 19 +
.../engine/core/generators/XmlBeansFiler.java | 4 +-
.../core/workflow/ParameterListModel.java | 4 +-
.../engine/datadriven/WorkflowHarvester.java | 4 +-
.../engine/file/XBayaPathConstants.java | 4 +-
.../engine/gfac/GFacRegistryClient.java | 4 +-
.../workflow/engine/gfac/SimpleWSClient.java | 4 +-
.../engine/globus/FileTransferConstants.java | 4 +-
.../globus/GridFTPFileTransferClient.java | 19 +
.../engine/graph/controller/NodeController.java | 19 +
.../engine/interpretor/DoWhileHandler.java | 3 +-
.../engine/interpretor/HeaderConstants.java | 4 +-
.../SSWorkflowInterpreterInteractorImpl.java | 4 +-
.../interpretor/SystemComponentInvoker.java | 4 +-
.../WorkFlowInterpreterException.java | 4 +-
.../interpretor/WorkflowExecutionMessage.java | 4 +-
.../engine/interpretor/WorkflowInterpreter.java | 5 +-
.../WorkflowInterpreterConfiguration.java | 4 +-
.../WorkflowInterpreterInteractor.java | 4 +-
.../interpretor/WorkflowInterpreterInvoker.java | 4 +-
.../WorkflowInterpreterSkeleton2.java | 19 +
.../engine/invoker/AsynchronousInvoker.java | 4 +-
.../workflow/engine/invoker/DynamicInvoker.java | 4 +-
.../workflow/engine/invoker/Invoker.java | 4 +-
.../invoker/MsgBoxWsaResponsesCorrelator.java | 21 +-
.../workflow/engine/invoker/SimpleInvoker.java | 4 +-
.../engine/invoker/WorkflowInputUtil.java | 5 +-
.../workflow/engine/util/AmazonUtil.java | 4 +-
.../airavata/workflow/engine/util/Data.java | 4 +-
.../workflow/engine/util/GOConstants.java | 4 +-
.../workflow/engine/util/GlobusOnlineUtils.java | 19 +
.../workflow/engine/util/InterpreterUtil.java | 3 +-
.../engine/util/ProxyMonitorPublisher.java | 4 +-
.../workflow/engine/util/RegistryConstants.java | 4 +-
.../workflow/engine/util/TransferFile.java | 4 +-
.../workflow/engine/util/XBayaUtil.java | 4 +-
.../workflow/WorkflowEngineException.java | 4 +-
.../engine/workflow/proxy/ProxyWSDL.java | 4 +-
.../engine/workflow/proxy/WorkflowClient.java | 4 +-
.../engine/workflow/proxy/WorkflowContext.java | 4 +-
.../workflow/proxy/WorkflowProxyException.java | 4 +-
.../interpreter/ComplexForEachWorkflowTest.java | 19 +
.../xbaya/interpreter/ComplexMathService.java | 4 +-
.../interpreter/ComplexMathWorkflowTest.java | 19 +
.../interpreter/CrossProductWorkflowTest.java | 19 +
.../airavata/xbaya/interpreter/EchoService.java | 3 +-
.../xbaya/interpreter/ForEachWorkflowTest.java | 19 +
.../interpreter/LevenshteinDistanceService.java | 4 +-
.../airavata/xbaya/interpreter/Listener.java | 19 +
.../xbaya/interpreter/NotificationSender.java | 19 +
.../xbaya/interpreter/RegistryServiceTest.java | 19 +
.../interpreter/SimpleForEachWorkflowTest.java | 19 +
.../interpreter/SimpleMathWorkflowTest.java | 19 +
.../xbaya/interpreter/WorkflowTest.java | 19 +
.../xbaya/interpreter/WorkflowTrackingTest.java | 19 +
.../xbaya/interpreter/XBayaClientTest.java | 5 +-
.../interpreter/XBayaConsolidatedTestSuite.java | 19 +
.../xbaya/interpreter/utils/ConfigKeys.java | 5 +-
.../xbaya/interpreter/utils/TestUtilServer.java | 19 +
.../interpreter/utils/WorkflowTestUtils.java | 19 +
.../workflow-model-component/pom.xml | 26 +-
.../registry/JCRComponentReference.java | 4 +-
.../registry/JCRComponentRegistry.java | 4 +-
.../workflow-model/workflow-model-core/pom.xml | 26 +-
.../workflow/model/component/Component.java | 4 +-
.../model/component/ComponentControlPort.java | 4 +-
.../model/component/ComponentDataPort.java | 4 +-
.../model/component/ComponentEPRPort.java | 4 +-
.../model/component/ComponentException.java | 4 +-
.../component/ComponentOperationReference.java | 4 +-
.../workflow/model/component/ComponentPort.java | 4 +-
.../model/component/ComponentReference.java | 4 +-
.../model/component/ComponentRegistry.java | 4 +-
.../component/ComponentRegistryException.java | 4 +-
.../amazon/AmazonComponentRegistry.java | 4 +-
.../component/amazon/InstanceComponent.java | 4 +-
.../amazon/InstanceComponentDataPort.java | 4 +-
.../amazon/TerminateInstanceComponent.java | 4 +-
.../component/dynamic/DynamicComponent.java | 4 +-
.../component/dynamic/DynamicComponentPort.java | 4 +-
.../local/LocalComponentReference.java | 4 +-
.../component/local/LocalComponentRegistry.java | 4 +-
.../model/component/system/BlockComponent.java | 4 +-
.../component/system/ConstantComponent.java | 4 +-
.../system/DifferedInputComponent.java | 8 +-
.../component/system/DoWhileComponent.java | 4 +-
.../component/system/EndBlockComponent.java | 4 +-
.../component/system/EndDoWhileComponent.java | 4 +-
.../component/system/EndForEachComponent.java | 4 +-
.../model/component/system/EndifComponent.java | 4 +-
.../model/component/system/ExitComponent.java | 4 +-
.../component/system/ForEachComponent.java | 4 +-
.../model/component/system/IfComponent.java | 4 +-
.../model/component/system/InputComponent.java | 4 +-
.../model/component/system/MemoComponent.java | 4 +-
.../model/component/system/OutputComponent.java | 4 +-
.../component/system/ReceiveComponent.java | 4 +-
.../component/system/S3InputComponent.java | 4 +-
.../component/system/StreamSourceComponent.java | 4 +-
.../component/system/SubWorkflowComponent.java | 4 +-
.../model/component/system/SystemComponent.java | 4 +-
.../system/SystemComponentDataPort.java | 4 +-
.../system/SystemComponentReference.java | 4 +-
.../system/SystemComponentRegistry.java | 4 +-
.../component/url/URLComponentReference.java | 4 +-
.../component/url/URLComponentRegistry.java | 4 +-
.../component/web/WebComponentReference.java | 4 +-
.../component/web/WebComponentRegistry.java | 4 +-
.../model/component/ws/WSComponent.java | 4 +-
.../component/ws/WSComponentApplication.java | 5 +-
.../ws/WSComponentApplicationParameter.java | 4 +-
.../model/component/ws/WSComponentFactory.java | 4 +-
.../model/component/ws/WSComponentKey.java | 4 +-
.../model/component/ws/WSComponentPort.java | 4 +-
.../component/ws/WSComponentReference.java | 4 +-
.../model/component/ws/WSComponentRegistry.java | 4 +-
.../model/component/ws/WorkflowComponent.java | 4 +-
.../exceptions/LazyLoadedDataException.java | 4 +-
.../model/exceptions/UtilsException.java | 4 +-
.../model/exceptions/WorkflowException.java | 4 +-
.../exceptions/WorkflowRuntimeException.java | 4 +-
.../airavata/workflow/model/gpel/DSCUtil.java | 4 +-
.../workflow/model/gpel/script/BPELScript.java | 6 +-
.../model/gpel/script/BPELScriptType.java | 4 +-
.../model/gpel/script/WorkflowWSDL.java | 5 +-
.../workflow/model/graph/ControlEdge.java | 4 +-
.../workflow/model/graph/ControlPort.java | 4 +-
.../airavata/workflow/model/graph/DataEdge.java | 4 +-
.../airavata/workflow/model/graph/DataPort.java | 4 +-
.../airavata/workflow/model/graph/EPRPort.java | 4 +-
.../airavata/workflow/model/graph/Edge.java | 4 +-
.../model/graph/ForEachExecutableNode.java | 5 +-
.../airavata/workflow/model/graph/Graph.java | 4 +-
.../workflow/model/graph/GraphException.java | 4 +-
.../workflow/model/graph/GraphFactory.java | 4 +-
.../workflow/model/graph/GraphPiece.java | 4 +-
.../workflow/model/graph/GraphSchema.java | 4 +-
.../airavata/workflow/model/graph/Node.java | 4 +-
.../airavata/workflow/model/graph/Port.java | 4 +-
.../model/graph/amazon/InstanceDataPort.java | 4 +-
.../model/graph/amazon/InstanceNode.java | 4 +-
.../model/graph/amazon/ResourceNode.java | 4 +-
.../graph/amazon/TerminateInstanceNode.java | 4 +-
.../model/graph/dynamic/BasicTypeMapping.java | 4 +-
.../model/graph/dynamic/DynamicNode.java | 4 +-
.../model/graph/dynamic/DynamicPort.java | 4 +-
.../model/graph/dynamic/PortAddable.java | 4 +-
.../model/graph/dynamic/SchemaCompilerUtil.java | 4 +-
.../workflow/model/graph/impl/EdgeImpl.java | 4 +-
.../workflow/model/graph/impl/GraphImpl.java | 4 +-
.../workflow/model/graph/impl/NodeImpl.java | 4 +-
.../workflow/model/graph/impl/PortImpl.java | 4 +-
.../graph/subworkflow/SubWorkflowNode.java | 4 +-
.../workflow/model/graph/system/BlockNode.java | 4 +-
.../model/graph/system/ConstantNode.java | 4 +-
.../model/graph/system/DifferedInputNode.java | 7 +-
.../model/graph/system/DoWhileNode.java | 4 +-
.../model/graph/system/EndBlockNode.java | 4 +-
.../model/graph/system/EndDoWhileNode.java | 4 +-
.../model/graph/system/EndForEachNode.java | 4 +-
.../workflow/model/graph/system/EndifNode.java | 4 +-
.../workflow/model/graph/system/ExitNode.java | 4 +-
.../model/graph/system/ForEachNode.java | 4 +-
.../workflow/model/graph/system/IfNode.java | 4 +-
.../workflow/model/graph/system/InputNode.java | 4 +-
.../workflow/model/graph/system/MemoNode.java | 4 +-
.../workflow/model/graph/system/OutputNode.java | 4 +-
.../model/graph/system/ParameterNode.java | 4 +-
.../model/graph/system/ReceiveNode.java | 4 +-
.../model/graph/system/S3InputNode.java | 4 +-
.../model/graph/system/StreamSourceNode.java | 4 +-
.../model/graph/system/SystemDataPort.java | 4 +-
.../workflow/model/graph/system/SystemNode.java | 4 +-
.../workflow/model/graph/util/GraphUtil.java | 4 +-
.../workflow/model/graph/ws/WSGraph.java | 4 +-
.../workflow/model/graph/ws/WSGraphFactory.java | 4 +-
.../workflow/model/graph/ws/WSNode.java | 4 +-
.../workflow/model/graph/ws/WSPort.java | 4 +-
.../workflow/model/graph/ws/WorkflowNode.java | 4 +-
.../workflow/model/ode/ODEBPELTransformer.java | 19 +
.../airavata/workflow/model/ode/ODEClient.java | 19 +
.../model/ode/ODEDeploymentDescriptor.java | 19 +
.../workflow/model/ode/ODEWSDLTransformer.java | 19 +
.../workflow/model/ode/WSDLCleaner.java | 19 +
.../model/utils/ApplicationVersion.java | 4 +-
.../workflow/model/utils/FileConstants.java | 4 +-
.../workflow/model/utils/MessageConstants.java | 4 +-
.../workflow/model/utils/WorkflowConstants.java | 4 +-
.../model/wf/InvalidDataFormatException.java | 4 +-
.../workflow/model/wf/TridentTransformer.java | 4 +-
.../airavata/workflow/model/wf/Workflow.java | 5 +-
.../workflow/model/wf/WorkflowData.java | 4 +-
.../model/wf/WorkflowExecutionState.java | 4 +-
.../workflow/model/wf/WorkflowInput.java | 4 +-
.../workflow/model/xsd/GFacSimpleTypesXSD.java | 4 +-
.../model/xsd/LeadContextHeaderXSD.java | 4 +-
.../workflow/model/xsd/LeadCrosscutXSD.java | 4 +-
modules/workflow/pom.xml | 31 +-
modules/workflow/workflow-core/pom.xml | 43 +-
.../airavata/workflow/core/WorkflowBuilder.java | 4 +-
.../workflow/core/WorkflowEnactmentService.java | 4 +-
.../airavata/workflow/core/WorkflowFactory.java | 4 +-
.../airavata/workflow/core/WorkflowInfo.java | 3 +-
.../workflow/core/WorkflowInterpreter.java | 4 +-
.../apache/airavata/workflow/core/XMLUtil.java | 585 +
.../airavata/workflow/core/XmlFormatter.java | 80 +
.../workflow/core/dag/edge/DirectedEdge.java | 4 +-
.../airavata/workflow/core/dag/edge/Edge.java | 4 +-
.../core/dag/nodes/ApplicationNode.java | 4 +-
.../core/dag/nodes/ApplicationNodeImpl.java | 4 +-
.../workflow/core/dag/nodes/InputNode.java | 4 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 4 +-
.../workflow/core/dag/nodes/NodeType.java | 4 +-
.../workflow/core/dag/nodes/OutputNode.java | 4 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 4 +-
.../workflow/core/dag/nodes/WorkflowNode.java | 4 +-
.../airavata/workflow/core/dag/port/InPort.java | 4 +-
.../workflow/core/dag/port/InputPortIml.java | 4 +-
.../workflow/core/dag/port/OutPort.java | 4 +-
.../workflow/core/dag/port/OutPortImpl.java | 4 +-
.../airavata/workflow/core/dag/port/Port.java | 4 +-
.../core/parser/JsonWorkflowParser.java | 4 +-
.../workflow/core/parser/ParserException.java | 3 +-
.../workflow/core/parser/WorkflowParser.java | 4 +-
.../airavata/workflow/core/XMLUtilTest.java | 55 +
.../core/parser/JsonWorkflowParserTest.java | 4 +-
modules/xbaya-gui/pom.xml | 26 +-
.../apache/airavata/xbaya/ThriftClientData.java | 4 +-
.../airavata/xbaya/ThriftServiceType.java | 4 +-
.../java/org/apache/airavata/xbaya/XBaya.java | 4 +-
.../airavata/xbaya/XBayaConfiguration.java | 4 +-
.../apache/airavata/xbaya/XBayaConstants.java | 4 +-
.../org/apache/airavata/xbaya/XBayaEngine.java | 4 +-
.../org/apache/airavata/xbaya/XBayaVersion.java | 4 +-
.../component/registry/ComponentController.java | 4 +-
.../registry/ComponentRegistryLoader.java | 4 +-
.../xbaya/concurrent/PredicatedExecutable.java | 5 +-
.../xbaya/concurrent/PredicatedTaskRunner.java | 5 +-
.../xbaya/core/amazon/AmazonCredential.java | 4 +-
.../xbaya/core/amazon/EC2InstanceResult.java | 4 +-
.../xbaya/core/generators/BPELFiler.java | 4 +-
.../xbaya/core/generators/ImageFiler.java | 4 +-
.../xbaya/core/generators/JythonFiler.java | 4 +-
.../xbaya/core/generators/ODEScriptFiler.java | 4 +-
.../xbaya/core/generators/ScuflFiler.java | 4 +-
.../xbaya/core/generators/WorkflowFiler.java | 4 +-
.../xbaya/core/generators/XmlBeansFiler.java | 4 +-
.../core/ide/XBayaExecutionModeListener.java | 4 +-
.../xbaya/core/workflow/ParameterListModel.java | 4 +-
.../xbaya/datadriven/WorkflowHarvester.java | 4 +-
.../airavata/xbaya/file/XBayaPathConstants.java | 4 +-
.../airavata/xbaya/gfac/GFacRegistryClient.java | 4 +-
.../airavata/xbaya/gfac/SimpleWSClient.java | 4 +-
.../xbaya/globus/FileTransferConstants.java | 4 +-
.../xbaya/globus/GridFTPFileTransferClient.java | 19 +
.../xbaya/graph/controller/NodeController.java | 4 +-
.../xbaya/interpretor/ExperimentTemplate.java | 19 +
.../GUIWorkflowInterpreterInteractorImpl.java | 19 +
.../xbaya/interpretor/HeaderConstants.java | 4 +-
.../SSWorkflowInterpreterInteractorImpl.java | 19 +
.../StandaloneNotificationSender.java | 4 +-
.../WorkFlowInterpreterException.java | 4 +-
.../interpretor/WorkflowExecutionMessage.java | 4 +-
.../interpretor/WorkflowExecutionTemplate.java | 19 +
.../xbaya/interpretor/WorkflowInterpreter.java | 19 +
.../WorkflowInterpreterConfiguration.java | 19 +
.../WorkflowInterpreterInteractor.java | 19 +
.../interpretor/WorkflowInterpreterInvoker.java | 4 +-
.../WorkflowInterpretorEventListener.java | 19 +
...WorkflowInterpretorMessageReceiverInOut.java | 19 +
.../WorkflowInterpretorSkeleton.java | 19 +
.../xbaya/jython/lib/GFacServiceCreator.java | 4 +-
.../xbaya/jython/lib/NotificationSender.java | 19 +
.../xbaya/jython/lib/ServiceNotifiable.java | 4 +-
.../jython/lib/ServiceNotificationSender.java | 19 +
.../StandaloneServiceNotificationSender.java | 4 +-
.../xbaya/jython/lib/WorkflowNotifiable.java | 4 +-
.../xbaya/jython/runner/JythonClassLoader.java | 4 +-
.../jython/runner/JythonOneTimeRunner.java | 4 +-
.../jython/runner/JythonOneTimeRunnerImpl.java | 4 +-
.../xbaya/jython/runner/JythonRunner.java | 4 +-
.../xbaya/jython/script/JythonScript.java | 4 +-
.../xbaya/menues/tools/ToolsMenuItem.java | 4 +-
.../airavata/xbaya/messaging/EventData.java | 4 +-
.../xbaya/messaging/EventDataListener.java | 4 +-
.../xbaya/messaging/EventDataRepository.java | 4 +-
.../airavata/xbaya/messaging/Monitor.java | 4 +-
.../xbaya/messaging/MonitorException.java | 4 +-
.../xbaya/messaging/NotificationHandler.java | 4 +-
.../airavata/xbaya/messaging/event/Event.java | 4 +-
.../xbaya/messaging/event/EventListener.java | 4 +-
.../xbaya/messaging/event/EventProducer.java | 4 +-
.../xbaya/modifier/WorkflowModifier.java | 4 +-
.../xbaya/registry/PasswordCallbackImpl.java | 19 +
.../xbaya/scufl/script/ScuflScript.java | 19 +
.../xbaya/test/util/WorkflowCreator.java | 19 +
.../org/apache/airavata/xbaya/ui/XBayaGUI.java | 4 +-
.../ui/actions/AbstractBrowserActionItem.java | 4 +-
.../ui/actions/registry/browser/AddAction.java | 4 +-
.../actions/registry/browser/BrowserAction.java | 4 +-
.../ui/actions/registry/browser/CopyAction.java | 4 +-
.../actions/registry/browser/DeleteAction.java | 4 +-
.../ui/actions/registry/browser/EditAction.java | 4 +-
.../actions/registry/browser/ImportAction.java | 4 +-
.../actions/registry/browser/RefreshAction.java | 4 +-
.../ui/actions/registry/browser/ViewAction.java | 4 +-
.../airavata/xbaya/ui/dialogs/AboutWindow.java | 4 +-
.../airavata/xbaya/ui/dialogs/ErrorWindow.java | 4 +-
.../ui/dialogs/GlobusFileTransferWindow.java | 19 +
.../airavata/xbaya/ui/dialogs/TextWindow.java | 4 +-
.../airavata/xbaya/ui/dialogs/WaitDialog.java | 4 +-
.../airavata/xbaya/ui/dialogs/XBayaDialog.java | 4 +-
.../dialogs/amazon/AmazonEC2InvokerWindow.java | 4 +-
.../ui/dialogs/amazon/AmazonS3UtilsWindow.java | 4 +-
.../xbaya/ui/dialogs/amazon/BucketsLoader.java | 4 +-
.../dialogs/amazon/ChangeCredentialWindow.java | 4 +-
.../amazon/EC2InstancesManagementWindow.java | 4 +-
.../ui/dialogs/amazon/EC2LaunchWindow.java | 4 +-
.../ui/dialogs/amazon/InstancesLoader.java | 4 +-
.../xbaya/ui/dialogs/amazon/S3Downloader.java | 4 +-
.../xbaya/ui/dialogs/amazon/S3Uploader.java | 4 +-
.../ui/dialogs/component/URLRegistryWindow.java | 4 +-
.../ui/dialogs/component/WebResigtryWindow.java | 4 +-
.../amazon/InstanceConfigurationDialog.java | 4 +-
.../system/ConstantConfigurationDialog.java | 4 +-
.../DifferedInputConfigurationDialog.java | 4 +-
.../graph/system/DoWhileConfigrationDialog.java | 4 +-
.../system/EndBlockConfigurationDialog.java | 4 +-
.../system/EndDoWhileConfigurationDialog.java | 4 +-
.../system/EndForEachConfigurationDialog.java | 4 +-
.../graph/system/EndifConfigurationDialog.java | 4 +-
.../system/ForEachConfigurationDialog.java | 4 +-
.../graph/system/IfConfigurationDialog.java | 4 +-
.../graph/system/InputConfigurationDialog.java | 4 +-
.../graph/system/MemoConfigurationDialog.java | 4 +-
.../graph/system/OutputConfigurationDialog.java | 4 +-
.../system/ReceiveConfigurationDialog.java | 4 +-
.../ui/dialogs/graph/system/S3FileChooser.java | 4 +-
.../system/StreamSourceConfigurationDialog.java | 4 +-
.../graph/ws/ServiceInteractionWindow.java | 4 +-
.../xbaya/ui/dialogs/graph/ws/WSNodeWindow.java | 4 +-
.../monitor/MonitorConfigurationWindow.java | 4 +-
.../xbaya/ui/dialogs/monitor/MonitorWindow.java | 4 +-
.../dialogs/registry/NewRegistryUserDialog.java | 4 +-
.../ui/dialogs/registry/RegistryWindow.java | 4 +-
.../registry/browser/JCRBrowserDialog.java | 4 +-
.../workflow/ParameterPropertyWindow.java | 4 +-
.../dialogs/workflow/WorkflowImportWindow.java | 4 +-
.../workflow/WorkflowPropertyWindow.java | 4 +-
.../xbaya/ui/experiment/ExperimentMenu.java | 4 +-
.../ui/experiment/LaunchApplicationWindow.java | 4 +-
.../ui/experiment/RegistrySearchResult.java | 4 +-
.../RegistryWorkflowPublisherWindow.java | 4 +-
.../WorkflowInterpreterLaunchWindow.java | 4 +-
.../apache/airavata/xbaya/ui/graph/EdgeGUI.java | 4 +-
.../airavata/xbaya/ui/graph/GraphCanvas.java | 4 +-
.../xbaya/ui/graph/GraphCanvasEvent.java | 4 +-
.../xbaya/ui/graph/GraphCanvasListener.java | 4 +-
.../airavata/xbaya/ui/graph/GraphGUI.java | 4 +-
.../airavata/xbaya/ui/graph/GraphPieceGUI.java | 4 +-
.../apache/airavata/xbaya/ui/graph/NodeGUI.java | 4 +-
.../airavata/xbaya/ui/graph/Paintable.java | 4 +-
.../apache/airavata/xbaya/ui/graph/PortGUI.java | 4 +-
.../xbaya/ui/graph/amazon/InstanceNodeGUI.java | 4 +-
.../graph/amazon/TerminateInstanceNodeGUI.java | 4 +-
.../graph/subworkflow/SubWorkflowNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/BlockNodeGUI.java | 4 +-
.../ui/graph/system/ConfigurableNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ConstantNodeGUI.java | 4 +-
.../ui/graph/system/DifferedInputHandler.java | 3 +-
.../ui/graph/system/DifferedInputNodeGUI.java | 3 +-
.../xbaya/ui/graph/system/DoWhileNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/EndBlockNodeGUI.java | 4 +-
.../ui/graph/system/EndDoWhileNodeGUI.java | 4 +-
.../ui/graph/system/EndForEachNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/EndifNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ExitNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ForEachNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/IfNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/InputNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/MemoNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/OutputNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ReceiveNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/S3InputNodeGUI.java | 4 +-
.../ui/graph/system/StreamSourceNodeGUI.java | 4 +-
.../airavata/xbaya/ui/graph/ws/WSNodeGUI.java | 4 +-
.../xbaya/ui/graph/ws/WorkflowNodeGUI.java | 4 +-
.../xbaya/ui/menues/AmazonEC2MenuItem.java | 4 +-
.../xbaya/ui/menues/ApplicationMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/EditMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/MenuIcons.java | 4 +-
.../xbaya/ui/menues/RegistryMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/RunMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/ViewMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/XBayaMenu.java | 4 +-
.../airavata/xbaya/ui/menues/XBayaMenuItem.java | 4 +-
.../xbaya/ui/monitor/MonitorEventHandler.java | 4 +-
.../xbaya/ui/monitor/MonitorStarter.java | 4 +-
.../xbaya/ui/monitor/ResourcePaintable.java | 4 +-
.../airavata/xbaya/ui/utils/Cancelable.java | 4 +-
.../airavata/xbaya/ui/utils/DrawUtils.java | 4 +-
.../airavata/xbaya/ui/utils/ErrorMessages.java | 4 +-
.../xbaya/ui/views/ComponentViewer.java | 4 +-
.../xbaya/ui/views/JCRBrowserPanel.java | 19 +
.../airavata/xbaya/ui/views/MonitorPanel.java | 4 +-
.../xbaya/ui/views/ParameterPropertyPanel.java | 4 +-
.../airavata/xbaya/ui/views/PortViewer.java | 4 +-
.../airavata/xbaya/ui/widgets/GridPanel.java | 4 +-
.../airavata/xbaya/ui/widgets/ScrollPanel.java | 4 +-
.../xbaya/ui/widgets/TabLabelButton.java | 4 +-
.../xbaya/ui/widgets/TableRenderable.java | 4 +-
.../xbaya/ui/widgets/ToolbarButton.java | 4 +-
.../xbaya/ui/widgets/XBayaComboBox.java | 4 +-
.../xbaya/ui/widgets/XBayaComponent.java | 4 +-
.../airavata/xbaya/ui/widgets/XBayaLabel.java | 3 +-
.../xbaya/ui/widgets/XBayaLinkButton.java | 4 +-
.../airavata/xbaya/ui/widgets/XBayaList.java | 4 +-
.../xbaya/ui/widgets/XBayaTextArea.java | 4 +-
.../xbaya/ui/widgets/XBayaTextComponent.java | 4 +-
.../xbaya/ui/widgets/XBayaTextField.java | 4 +-
.../airavata/xbaya/ui/widgets/XBayaToolBar.java | 4 +-
.../xbaya/ui/widgets/XbayaEnhancedList.java | 4 +-
.../xbaya/ui/widgets/amazon/S3Tree.java | 4 +-
.../xbaya/ui/widgets/amazon/S3TreeModel.java | 4 +-
.../ui/widgets/component/ComponentSelector.java | 4 +-
.../component/ComponentSelectorEvent.java | 4 +-
.../component/ComponentSelectorListener.java | 4 +-
.../component/ComponentSourceTransferable.java | 4 +-
.../widgets/component/ComponentTreeModel.java | 4 +-
.../ui/widgets/component/ComponentTreeNode.java | 4 +-
.../apache/airavata/xbaya/util/AmazonUtil.java | 4 +-
.../org/apache/airavata/xbaya/util/Data.java | 4 +-
.../apache/airavata/xbaya/util/GOConstants.java | 4 +-
.../airavata/xbaya/util/GlobusOnlineUtils.java | 19 +
.../airavata/xbaya/util/RegistryConstants.java | 4 +-
.../airavata/xbaya/util/TransferFile.java | 4 +-
.../apache/airavata/xbaya/util/XBayaUtil.java | 4 +-
.../airavata/xbaya/workflow/WorkflowClient.java | 4 +-
.../xbaya/workflow/WorkflowEngineException.java | 4 +-
.../xbaya/workflow/proxy/ProxyWSDL.java | 4 +-
.../xbaya/workflow/proxy/WorkflowClient.java | 4 +-
.../xbaya/workflow/proxy/WorkflowContext.java | 4 +-
.../workflow/proxy/WorkflowProxyException.java | 4 +-
.../interpreter/ComplexForEachWorkflowTest.java | 19 +
.../xbaya/interpreter/ComplexMathService.java | 4 +-
.../interpreter/ComplexMathWorkflowTest.java | 19 +
.../interpreter/CrossProductWorkflowTest.java | 19 +
.../airavata/xbaya/interpreter/EchoService.java | 3 +-
.../xbaya/interpreter/ForEachWorkflowTest.java | 19 +
.../interpreter/LevenshteinDistanceService.java | 4 +-
.../airavata/xbaya/interpreter/Listener.java | 19 +
.../xbaya/interpreter/NotificationSender.java | 19 +
.../xbaya/interpreter/RegistryServiceTest.java | 19 +
.../interpreter/SimpleForEachWorkflowTest.java | 19 +
.../interpreter/SimpleMathWorkflowTest.java | 19 +
.../xbaya/interpreter/WorkflowTest.java | 19 +
.../xbaya/interpreter/WorkflowTrackingTest.java | 19 +
.../xbaya/interpreter/XBayaClientTest.java | 5 +-
.../interpreter/XBayaConsolidatedTestSuite.java | 19 +
.../xbaya/interpreter/utils/ConfigKeys.java | 5 +-
.../xbaya/interpreter/utils/TestUtilServer.java | 19 +
.../interpreter/utils/WorkflowTestUtils.java | 19 +
modules/xbaya/pom.xml | 329 -
.../src/main/java/org/airavata/xbaya/App.java | 32 -
.../org/airavata/xbaya/ui/home/HomeWindow.java | 42 -
.../src/main/resources/images/airavata-2.png | Bin 5582 -> 0 bytes
.../main/resources/images/airavata-config.png | Bin 1297 -> 0 bytes
.../src/main/resources/images/airavata-icon.png | Bin 584 -> 0 bytes
.../main/resources/images/airavata-icon2.png | Bin 981 -> 0 bytes
.../src/main/resources/images/airavata-name.png | Bin 8261 -> 0 bytes
.../resources/images/airavata-title-text.png | Bin 16438 -> 0 bytes
.../src/main/resources/images/airavata.png | Bin 17280 -> 0 bytes
.../src/main/resources/images/application.png | Bin 894 -> 0 bytes
.../src/main/resources/images/applications.png | Bin 657 -> 0 bytes
.../xbaya/src/main/resources/images/closed.gif | Bin 923 -> 0 bytes
.../xbaya/src/main/resources/images/cloud.png | Bin 573 -> 0 bytes
.../src/main/resources/images/experiment.png | Bin 543 -> 0 bytes
.../src/main/resources/images/experiments.png | Bin 1142 -> 0 bytes
.../src/main/resources/images/gfac_url.png | Bin 739 -> 0 bytes
.../src/main/resources/images/gfac_urls.png | Bin 816 -> 0 bytes
.../xbaya/src/main/resources/images/host.png | Bin 652 -> 0 bytes
.../xbaya/src/main/resources/images/hosts.png | Bin 671 -> 0 bytes
.../src/main/resources/images/input_para.png | Bin 428 -> 0 bytes
.../src/main/resources/images/jcr-repo.png | Bin 1010 -> 0 bytes
.../xbaya/src/main/resources/images/leaf.gif | Bin 906 -> 0 bytes
.../src/main/resources/images/menu/jcr.png | Bin 1158 -> 0 bytes
.../src/main/resources/images/menu/new2.png | Bin 1175 -> 0 bytes
.../src/main/resources/images/menu/open1.png | Bin 925 -> 0 bytes
.../src/main/resources/images/menu/open2.png | Bin 964 -> 0 bytes
.../src/main/resources/images/menu/open_dir.png | Bin 749 -> 0 bytes
.../src/main/resources/images/menu/pause1.png | Bin 1101 -> 0 bytes
.../resources/images/menu/pause_monitor1.png | Bin 873 -> 0 bytes
.../src/main/resources/images/menu/play3.png | Bin 1192 -> 0 bytes
.../src/main/resources/images/menu/play4.png | Bin 765 -> 0 bytes
.../images/menu/resume_monitoring1.png | Bin 957 -> 0 bytes
.../src/main/resources/images/menu/save1.png | Bin 1200 -> 0 bytes
.../src/main/resources/images/menu/stop.png | Bin 316 -> 0 bytes
.../xbaya/src/main/resources/images/opened.gif | Bin 917 -> 0 bytes
.../src/main/resources/images/output_para.png | Bin 490 -> 0 bytes
.../src/main/resources/images/parameter.png | Bin 544 -> 0 bytes
.../xbaya/src/main/resources/images/pause.jpeg | Bin 458 -> 0 bytes
.../xbaya/src/main/resources/images/play.jpeg | Bin 471 -> 0 bytes
.../src/main/resources/images/registry.png | Bin 3419 -> 0 bytes
.../xbaya/src/main/resources/images/service.png | Bin 871 -> 0 bytes
.../src/main/resources/images/services.png | Bin 899 -> 0 bytes
.../xbaya/src/main/resources/images/step.gif | Bin 211 -> 0 bytes
.../xbaya/src/main/resources/images/stop.jpeg | Bin 497 -> 0 bytes
.../src/main/resources/images/workflow.png | Bin 601 -> 0 bytes
.../resources/images/workflow_templates.png | Bin 710 -> 0 bytes
.../src/main/resources/images/workflows.png | Bin 778 -> 0 bytes
.../xbaya/src/main/resources/views/home.fxml | 587 -
.../test/java/org/airavata/xbaya/AppTest.java | 58 -
pom.xml | 1337 +-
sandbox/amqpwstunnel/python/amqpwstunnel.py | 603 +
sandbox/amqpwstunnel/python/config.json | 10 +
sandbox/amqpwstunnel/wstest.html | 178 +
sandbox/job-status-rest-server/README.MD | 9 +
sandbox/job-status-rest-server/api_test.py | 26 +
sandbox/job-status-rest-server/app.py | 70 +
sandbox/simstream/README.md | 18 +
sandbox/simstream/example/README.md | 9 +
.../simstream/example/logfile_checker/README.md | 23 +
.../example/logfile_checker/generate_logs.sh | 42 +
.../example/logfile_checker/log_consumer.py | 63 +
.../example/logfile_checker/log_streamer.py | 131 +
.../example/logfile_checker/remote_log.slurm | 21 +
.../simstream/example/logfile_checker/test.txt | 677 +
.../simstream/example/mem_streamer/README.md | 17 +
.../example/mem_streamer/memory_consumption.py | 103 +
.../example/mem_streamer/memory_streamer.py | 66 +
.../simstream/example/openmm_example/README.md | 33 +
.../application/alanine_dipeptide.py | 75 +
.../openmm_example/application/input.pdb | 24 +
.../openmm_example/application/trajectory.dcd | 0
.../example/openmm_example/openmm_consumer.py | 28 +
.../openmm_example/openmm_log_consumer.py | 52 +
.../openmm_example/openmm_rmsd_consumer.py | 56 +
.../example/openmm_example/openmm_stream.slurm | 19 +
.../example/openmm_example/openmm_streamer.py | 150 +
.../simstream/example/openmm_example/test.txt | 20 +
sandbox/simstream/example/settings.json | 6 +
sandbox/simstream/setup.py | 39 +
sandbox/simstream/simstream/__init__.py | 31 +
sandbox/simstream/simstream/datacollector.py | 130 +
sandbox/simstream/simstream/datareporter.py | 189 +
sandbox/simstream/simstream/eventhandler.py | 37 +
sandbox/simstream/simstream/eventmonitor.py | 66 +
.../simstream/simstream/pikaasyncconsumer.py | 223 +
sandbox/simstream/simstream/pikaproducer.py | 222 +
sandbox/simstream/simstream/simstream.py | 187 +
.../airavata-apis/airavata_api.thrift | 613 +-
.../airavata-apis/airavata_errors.thrift | 9 +
.../airavata-apis/db_event_model.thrift | 81 +
.../airavata-apis/messaging_events.thrift | 3 +-
.../component-cpis/credential-store-cpi.thrift | 16 +-
.../credential_store_data_models.thrift | 62 -
.../component-cpis/generate-cpi-stubs.sh | 46 +-
.../component-cpis/registry-api.thrift | 395 +-
.../component-cpis/user-profile-cpi.thrift | 57 +
.../user_profile_cpi_errors.thrift | 32 +
.../data-models/airavata_data_models.thrift | 7 +-
.../application_deployment_model.thrift | 5 +
.../application_io_models.thrift | 3 +-
.../credential_store_data_models.thrift | 89 +
.../experiment_model.thrift | 1 +
.../process_model.thrift | 3 +-
.../status_models.thrift | 9 +
.../replica_catalog_models.thrift | 31 +-
.../compute_resource_model.thrift | 22 +-
.../resource_catalog_models.thrift | 3 +-
.../user_resource_profile_model.thrift | 109 +
.../user-group-models/group_manager_cpi.thrift | 95 -
.../group_manager_model.thrift | 47 -
.../user-group-models/user_profile_model.thrift | 185 -
.../group_manager_model.thrift | 48 +
.../tenant_profile_model.thrift | 58 +
.../user_profile_model.thrift | 196 +
.../generate-thrift-stubs.sh | 42 +-
.../service-cpis/generate-service-cpi-stubs.sh | 181 +
.../iam-admin-services-cpi.thrift | 81 +
.../iam_admin_services_cpi_errors.thrift | 32 +
.../profile-service/profile-service-cpi.thrift | 34 +
.../profile-tenant/profile-tenant-cpi.thrift | 70 +
.../profile_tenant_cpi_errors.thrift | 32 +
.../profile-user/profile-user-cpi.thrift | 74 +
.../profile-user/profile_user_cpi_errors.thrift | 32 +
tools/gsissh-cli-tools/README.txt | 20 +
tools/gsissh-cli-tools/pom.xml | 29 +-
.../ssh/cli/SSHApiClientWithMyProxyAuth.java | 4 +-
tools/phoebus-integration/pom.xml | 26 +-
.../impl/PhoebusGridConfigurationHandler.java | 4 +-
.../airavata/core/gfac/utils/PhoebusUtils.java | 4 +-
tools/pom.xml | 26 +-
tools/rabbitmq-download-start.sh | 20 +
2272 files changed, 477590 insertions(+), 137414 deletions(-)
----------------------------------------------------------------------