This is an automated email from the ASF dual-hosted git repository.
yasith pushed a change to branch service-layer-improvements
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 05416f0d34 update most tests to get to starting state. fixed some di
issues, still some issues remaining
new 6e00649389 fix startup bugs
new f8ddbcaa97 broke services down into logical pieces
new c0de7e03f9 cleanup services and separate them to logicalp arts. remove
deprecated thrift functions
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
airavata-api/pom.xml | 20 +-
.../org/apache/airavata/AiravataApplication.java | 12 +-
.../accountprovisioning/SSHAccountManager.java | 4 +-
.../thrift/handler/CredentialServiceHandler.java | 34 +-
.../thrift/handler/GroupManagerServiceHandler.java | 2 +-
.../api/thrift/handler/IamAdminServiceHandler.java | 47 +-
.../thrift/handler/OrchestratorServiceHandler.java | 2 +-
.../api/thrift/handler/RegistryServiceHandler.java | 2 +-
.../handler/TenantProfileServiceHandler.java | 2 +-
.../thrift/handler/UserProfileServiceHandler.java | 4 +-
.../org/apache/airavata/common/utils/JPAUtils.java | 5 +-
.../java/org/apache/airavata/config/JpaConfig.java | 76 +-
.../airavata/config/JpaMappingContextConfig.java | 56 ++
.../config/JpaMappingContextRegistrar.java | 28 +
.../OpenJpaMetamodelMappingContextFactoryBean.java | 135 +--
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 4 +-
.../airavata/helix/adaptor/SSHJStorageAdaptor.java | 4 +-
.../airavata/helix/agent/ssh/SshAgentAdaptor.java | 4 +-
.../agent/storage/StorageResourceAdaptorImpl.java | 4 +-
.../core/support/adaptor/AdaptorSupportImpl.java | 8 +-
.../helix/impl/participant/GlobalParticipant.java | 3 +-
.../airavata/helix/impl/task/AWSTaskFactory.java | 6 +-
.../airavata/helix/impl/task/AiravataTask.java | 6 +-
.../airavata/helix/impl/task/SlurmTaskFactory.java | 6 +-
.../airavata/helix/impl/task/TaskContext.java | 4 +-
.../helix/impl/task/aws/AWSCompletingTask.java | 6 +-
.../helix/impl/task/aws/AWSJobSubmissionTask.java | 8 +-
.../impl/task/aws/AWSProcessContextManager.java | 2 +-
.../helix/impl/task/aws/CreateEC2InstanceTask.java | 6 +-
.../helix/impl/task/aws/NoOperationTask.java | 6 +-
.../helix/impl/task/aws/utils/AWSTaskUtil.java | 4 +-
.../impl/task/cancel/CancelCompletingTask.java | 6 +-
.../task/cancel/RemoteJobCancellationTask.java | 6 +-
.../helix/impl/task/completing/CompletingTask.java | 6 +-
.../airavata/helix/impl/task/env/EnvSetupTask.java | 6 +-
.../helix/impl/task/parsing/DataParsingTask.java | 2 +-
.../impl/task/parsing/ParsingTriggeringTask.java | 6 +-
.../helix/impl/task/staging/ArchiveTask.java | 6 +-
.../helix/impl/task/staging/DataStagingTask.java | 6 +-
.../impl/task/staging/InputDataStagingTask.java | 6 +-
.../impl/task/staging/JobVerificationTask.java | 6 +-
.../impl/task/staging/OutputDataStagingTask.java | 6 +-
.../task/submission/DefaultJobSubmissionTask.java | 6 +-
.../task/submission/ForkJobSubmissionTask.java | 6 +-
.../impl/task/submission/JobSubmissionTask.java | 6 +-
.../task/submission/LocalJobSubmissionTask.java | 6 +-
.../task/submission/config/GroovyMapBuilder.java | 2 +-
.../impl/task/submission/config/JobFactory.java | 2 +-
.../helix/impl/workflow/ParserWorkflowManager.java | 6 +-
.../helix/impl/workflow/PostWorkflowManager.java | 14 +-
.../helix/impl/workflow/PreWorkflowManager.java | 14 +-
.../helix/impl/workflow/WorkflowManager.java | 2 +-
.../airavata/metascheduler/core/utils/Utils.java | 2 +-
.../metadata/analyzer/impl/DataAnalyzerImpl.java | 2 +-
.../scheduling/api/ProcessSchedulerImpl.java | 2 +-
.../ComputeResourceSelectionPolicyImpl.java | 2 +-
.../DefaultComputeResourceSelectionPolicy.java | 2 +-
.../selection/MultipleComputeResourcePolicy.java | 2 +-
.../rescheduler/ExponentialBackOffReScheduler.java | 2 +-
.../engine/rescheduler/ProcessScannerImpl.java | 2 +-
.../apache/airavata/monitor/AbstractMonitor.java | 2 +-
.../monitor/cluster/ClusterStatusMonitorJob.java | 4 +-
.../compute/job/ComputeResourceMonitor.java | 2 +-
.../monitor/compute/job/MonitoringJob.java | 2 +-
.../airavata/monitor/email/EmailBasedMonitor.java | 4 +-
.../email/parser/AiravataCustomMailParser.java | 2 +-
.../airavata/monitor/email/parser/EmailParser.java | 2 +-
.../monitor/email/parser/HTCondorEmailParser.java | 2 +-
.../monitor/email/parser/LSFEmailParser.java | 2 +-
.../monitor/email/parser/PBSEmailParser.java | 2 +-
.../monitor/email/parser/SLURMEmailParser.java | 2 +-
.../monitor/email/parser/UGEEmailParser.java | 2 +-
.../airavata/monitor/realtime/RealtimeMonitor.java | 4 +-
.../realtime/parser/RealtimeJobStatusParser.java | 2 +-
.../orchestrator/impl/SimpleOrchestratorImpl.java | 145 +--
.../airavata/orchestrator/task/TaskFactory.java | 64 ++
.../orchestrator/utils/OrchestratorUtils.java | 2 +-
.../orchestrator/validation/ValidationService.java | 40 +
.../validation/impl/ValidationServiceImpl.java | 136 +++
.../validator/BatchQueueValidator.java | 2 +-
.../validator/GroupResourceProfileValidator.java | 2 +-
.../entities/CustomizedDashboardEntity.java | 1 +
.../profile/entities/UserProfileEntity.java | 7 +-
.../messaging/RegistryServiceDBEventHandler.java | 4 +-
.../RegistryServiceDBEventMessagingFactory.java | 4 +-
.../security/GatewayGroupsInitializer.java | 4 +-
.../airavata/security/KeyCloakSecurityManager.java | 4 +-
.../apache/airavata/service/AiravataService.java | 578 +++---------
.../service/application/ApplicationService.java | 49 ++
.../application/impl/ApplicationServiceImpl.java | 150 ++++
.../airavata/service/data/DataProductService.java | 40 +
.../service/data/impl/DataProductServiceImpl.java | 105 +++
.../service/experiment/ExperimentService.java | 50 ++
.../experiment/impl/ExperimentServiceImpl.java | 171 ++++
.../service/notification/NotificationService.java | 39 +
.../notification/impl/NotificationServiceImpl.java | 104 +++
.../OrchestratorRegistryService.java | 7 +-
.../{ => orchestrator}/OrchestratorService.java | 4 +-
.../{ => profile}/TenantProfileService.java | 3 +-
.../service/{ => profile}/UserProfileService.java | 5 +-
.../airavata/service/project/ProjectService.java | 41 +
.../service/project/impl/ProjectServiceImpl.java | 113 +++
.../service/{ => registry}/RegistryService.java | 2 +-
.../service/security/AuthorizationService.java | 55 ++
.../{ => security}/CredentialStoreService.java | 131 +--
.../{ => security}/GroupManagerService.java | 4 +-
.../service/{ => security}/IamAdminService.java | 4 +-
.../security/impl/AuthorizationServiceImpl.java | 210 +++++
.../airavata/service/sharing/SharingManager.java | 51 ++
.../service/sharing/impl/SharingManagerImpl.java | 230 +++++
.../sharing/migrator/AiravataDataMigrator.java | 978 ---------------------
.../src/main/resources/META-INF/persistence.xml | 16 +-
.../repositories/WorkspaceRepositoryTest.java | 10 +-
.../ApplicationDeploymentRepositoryTest.java | 1 +
.../ApplicationInterfaceRepositoryTest.java | 10 +-
.../appcatalog/ComputeResourceRepositoryTest.java | 1 +
.../appcatalog/GatewayGroupsRepositoryTest.java | 1 +
.../appcatalog/GatewayProfileRepositoryTest.java | 1 +
.../GroupResourceProfileRepositoryTest.java | 1 +
.../JobSubmissionInterfaceRepositoryTest.java | 1 +
.../appcatalog/StorageResourceRepositoryTest.java | 5 +-
.../UserResourceProfileRepositoryTest.java | 1 +
.../expcatalog/ExperimentErrorRepositoryTest.java | 10 +-
.../expcatalog/ExperimentInputRepositoryTest.java | 10 +-
.../expcatalog/ExperimentOutputRepositoryTest.java | 10 +-
.../expcatalog/ExperimentRepositoryTest.java | 10 +-
.../expcatalog/ExperimentStatusRepositoryTest.java | 10 +-
.../ExperimentSummaryRepositoryTest.java | 10 +-
.../expcatalog/GatewayRepositoryTest.java | 14 +-
.../repositories/expcatalog/JobRepositoryTest.java | 10 +-
.../expcatalog/JobStatusRepositoryTest.java | 10 +-
.../expcatalog/NotificationRepositoryTest.java | 10 +-
.../expcatalog/ProcessErrorRepositoryTest.java | 10 +-
.../expcatalog/ProcessInputRepositoryTest.java | 10 +-
.../expcatalog/ProcessOutputRepositoryTest.java | 10 +-
.../expcatalog/ProcessRepositoryTest.java | 10 +-
.../expcatalog/ProcessStatusRepositoryTest.java | 10 +-
.../expcatalog/ProjectRepositoryTest.java | 15 +-
.../expcatalog/QueueStatusRepositoryTest.java | 10 +-
.../expcatalog/TaskErrorRepositoryTest.java | 10 +-
.../expcatalog/TaskRepositoryTest.java | 10 +-
.../expcatalog/TaskStatusRepositoryTest.java | 10 +-
.../expcatalog/UserRepositoryTest.java | 10 +-
.../replicacatalog/DataProductRepositoryTest.java | 10 +-
.../DataReplicaLocationRepositoryTest.java | 10 +-
.../workflowcatalog/WorkflowRepositoryTest.java | 1 +
.../integration/ServiceIntegrationTestBase.java | 77 +-
.../service-cpis/credential-store-cpi.thrift | 14 -
.../iam-admin-services-cpi.thrift | 17 -
149 files changed, 2447 insertions(+), 2174 deletions(-)
create mode 100644
airavata-api/src/main/java/org/apache/airavata/config/JpaMappingContextConfig.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/config/JpaMappingContextRegistrar.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/orchestrator/task/TaskFactory.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/orchestrator/validation/ValidationService.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/orchestrator/validation/impl/ValidationServiceImpl.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/application/ApplicationService.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/application/impl/ApplicationServiceImpl.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/data/DataProductService.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/data/impl/DataProductServiceImpl.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/experiment/impl/ExperimentServiceImpl.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/notification/NotificationService.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/notification/impl/NotificationServiceImpl.java
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
orchestrator}/OrchestratorRegistryService.java (95%)
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
orchestrator}/OrchestratorService.java (99%)
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
profile}/TenantProfileService.java (99%)
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
profile}/UserProfileService.java (98%)
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/project/impl/ProjectServiceImpl.java
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
registry}/RegistryService.java (99%)
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/security/AuthorizationService.java
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
security}/CredentialStoreService.java (76%)
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
security}/GroupManagerService.java (98%)
rename airavata-api/src/main/java/org/apache/airavata/service/{ =>
security}/IamAdminService.java (99%)
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/security/impl/AuthorizationServiceImpl.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingManager.java
create mode 100644
airavata-api/src/main/java/org/apache/airavata/service/sharing/impl/SharingManagerImpl.java
delete mode 100644
airavata-api/src/main/java/org/apache/airavata/sharing/migrator/AiravataDataMigrator.java
