You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/06/04 12:18:13 UTC
[airavata] branch group-based-auth updated (0c96efb -> 2d7227a)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 0c96efb AIRAVATA-2795 KeyCloakSecurityManager to use GatewayGroups instead of roles
add 176d1b7 Adding/modifying expcatalog entities
add c26d7e4 Adding utils
add 24bfe90 Modifying tests
add dd2a5d8 Adding repository classes
add bbe3781 Resolving merge conflicts
add 2f4e344 Making changes to repository classes
add 529ac9d Making changes to repository classes
add 9f01566 Merge remote-tracking branch 'upstream/group-based-auth' into group-based-auth
add c27b477 Merge remote-tracking branch 'upstream/group-based-auth' into group-based-auth
add 9092156 Initial commit for tests
add bf2bbf4 Making changes to Gateway and Notification tests
add 5d176dd Adding tests for Project
add ce87faf Adding/modifying tests
add c94aa67 Deleting gateway and project entities in tests
add d89b1b6 Removing unwanted repositories and tests
add 2995f99 Adding test for ExperimentSummaryRepository
add b86eea7 Making final test changes
add aa23561 Making changes to method calls in RegistryServerHandler
add 3a8dc0d Removing outdated entity class
add 6b5363a Resolving merge conflict
add 3fe6d22 Updating entities according to expcatalog-mysql.sql
add 638b3f9 Resolving review comments
add 2669ea0 Adding new repositories for experiments and cleaning up some tests
add 7c12e1b Adding new process repositories
add 75aff2d Adding new task repositories
add 34b9f6d Adding new job repository
add 366ca64 Merge remote-tracking branch 'upstream/group-based-auth' into group-based-auth
add 4a12fdc Merge remote-tracking branch 'upstream/group-based-auth' into group-based-auth
add bc5971d Adding license header
new d198a31 Merge branch 'group-based-auth' of https://github.com/tilaks26/airavata into tilaks26-group-based-auth
new 2d7227a Merge branch 'tilaks26-group-based-auth' into group-based-auth
The 2 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/model/status/ExperimentStatus.java | 113 +++++-
.../apache/airavata/model/status/JobStatus.java | 113 +++++-
.../airavata/model/status/ProcessStatus.java | 113 +++++-
.../apache/airavata/model/status/TaskStatus.java | 113 +++++-
.../core/entities/expcatalog/ExperimentEntity.java | 116 +++---
.../entities/expcatalog/ExperimentErrorEntity.java | 60 ++--
.../entities/expcatalog/ExperimentErrorPK.java | 52 +--
.../entities/expcatalog/ExperimentInputEntity.java | 93 +++--
.../entities/expcatalog/ExperimentInputPK.java | 51 +--
.../expcatalog/ExperimentOutputEntity.java | 78 ++--
.../entities/expcatalog/ExperimentOutputPK.java | 51 +--
.../expcatalog/ExperimentStatusEntity.java | 51 ++-
.../entities/expcatalog/ExperimentStatusPK.java | 61 ++--
.../expcatalog/ExperimentSummaryEntity.java | 158 ++++++++
.../GatewayEntity.java | 114 +++---
.../entities/expcatalog/GatewayWorkerEntity.java | 61 ++++
.../core/entities/expcatalog/GatewayWorkerPK.java | 75 ++++
.../core/entities/expcatalog/JobEntity.java | 72 ++--
.../expcatalog/{JobStatusPK.java => JobPK.java} | 66 ++--
.../core/entities/expcatalog/JobStatusEntity.java | 75 +++-
.../core/entities/expcatalog/JobStatusPK.java | 69 ++--
.../NotificationEntity.java | 68 ++--
.../core/entities/expcatalog/ProcessEntity.java | 159 +++++---
.../entities/expcatalog/ProcessErrorEntity.java | 61 ++--
.../core/entities/expcatalog/ProcessErrorPK.java | 52 +--
.../entities/expcatalog/ProcessInputEntity.java | 104 ++++--
.../core/entities/expcatalog/ProcessInputPK.java | 51 +--
.../entities/expcatalog/ProcessOutputEntity.java | 83 +++--
.../core/entities/expcatalog/ProcessOutputPK.java | 47 +--
...ity.java => ProcessResourceScheduleEntity.java} | 93 ++---
.../entities/expcatalog/ProcessStatusEntity.java | 51 ++-
.../core/entities/expcatalog/ProcessStatusPK.java | 61 ++--
.../ProjectEntity.java | 48 ++-
.../entities/expcatalog/ProjectUserEntity.java | 61 ++++
.../core/entities/expcatalog/ProjectUserPK.java | 75 ++++
.../entities/expcatalog/QueueStatusEntity.java | 109 ++++++
.../core/entities/expcatalog/QueueStatusPK.java | 89 +++++
.../core/entities/expcatalog/TaskEntity.java | 85 +++--
.../core/entities/expcatalog/TaskErrorEntity.java | 61 ++--
.../core/entities/expcatalog/TaskErrorPK.java | 52 +--
.../core/entities/expcatalog/TaskStatusEntity.java | 51 ++-
.../core/entities/expcatalog/TaskStatusPK.java | 61 ++--
...ntity.java => UserConfigurationDataEntity.java} | 185 ++++++++--
.../expcatalog/UserConfigurationEntity.java | 131 -------
.../expcatalog/ExpCatAbstractRepository.java | 111 ++++++
.../expcatalog/ExperimentErrorRepository.java | 76 ++++
.../expcatalog/ExperimentInputRepository.java | 71 ++++
.../expcatalog/ExperimentOutputRepository.java | 73 ++++
.../expcatalog/ExperimentRepository.java | 194 +++++++---
.../expcatalog/ExperimentStatusRepository.java | 103 ++++++
.../expcatalog/ExperimentSummaryRepository.java | 291 +++++++++++++++
.../repositories/expcatalog/GatewayRepository.java | 106 ++++++
.../repositories/expcatalog/JobRepository.java | 137 +++++++
.../expcatalog/JobStatusRepository.java | 107 ++++++
.../expcatalog/NotificationRepository.java | 104 ++++++
.../expcatalog/ProcessErrorRepository.java | 74 ++++
.../expcatalog/ProcessInputRepository.java | 71 ++++
.../expcatalog/ProcessOutputRepository.java | 71 ++++
.../repositories/expcatalog/ProcessRepository.java | 165 +++++++++
.../expcatalog/ProcessStatusRepository.java | 102 ++++++
.../repositories/expcatalog/ProjectRepository.java | 205 +++++++++++
.../expcatalog/QueueStatusRepository.java | 55 +++
.../expcatalog/TaskErrorRepository.java | 54 +++
.../repositories/expcatalog/TaskRepository.java | 133 +++++++
.../expcatalog/TaskStatusRepository.java | 79 ++++
.../workspacecatalog/GatewayRepository.java | 36 --
.../workspacecatalog/NotificationRepository.java | 35 --
.../airavata/registry/core/utils/DBConstants.java | 55 +++
.../ExpCatalogUtils.java} | 24 +-
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 84 +++++
.../registry/core/utils/QueryConstants.java | 33 ++
.../src/main/resources/META-INF/persistence.xml | 23 +-
.../src/main/resources/expcatalog-derby.sql | 397 ++++++++++++++++++++
.../src/main/resources/expcatalog-mysql.sql | 400 +++++++++++++++++++++
.../src/main/resources/experiment_catalog.sql | 285 ---------------
.../src/main/resources/workspace_catalog.sql | 125 -------
.../repositories/ExperimentRepositoryTest.java | 157 --------
.../core/repositories/WorkspaceRepositoryTest.java | 279 --------------
.../expcatalog/ExperimentErrorRepositoryTest.java | 113 ++++++
.../expcatalog/ExperimentInputRepositoryTest.java | 116 ++++++
.../expcatalog/ExperimentOutputRepositoryTest.java | 116 ++++++
.../expcatalog/ExperimentRepositoryTest.java | 121 +++++++
.../expcatalog/ExperimentStatusRepositoryTest.java | 110 ++++++
.../ExperimentSummaryRepositoryTest.java | 208 +++++++++++
.../expcatalog/GatewayRepositoryTest.java | 83 +++++
.../repositories/expcatalog/JobRepositoryTest.java | 147 ++++++++
.../expcatalog/JobStatusRepositoryTest.java | 148 ++++++++
.../expcatalog/NotificationRepositoryTest.java | 82 +++++
.../expcatalog/ProcessErrorRepositoryTest.java | 119 ++++++
.../expcatalog/ProcessInputRepositoryTest.java | 122 +++++++
.../expcatalog/ProcessOutputRepositoryTest.java | 123 +++++++
.../expcatalog/ProcessRepositoryTest.java | 127 +++++++
.../expcatalog/ProcessStatusRepositoryTest.java | 117 ++++++
.../expcatalog/ProjectRepositoryTest.java | 111 ++++++
.../expcatalog/QueueStatusRepositoryTest.java | 78 ++++
.../expcatalog/TaskErrorRepositoryTest.java | 131 +++++++
.../expcatalog/TaskRepositoryTest.java | 127 +++++++
.../expcatalog/TaskStatusRepositoryTest.java | 108 ++++++
.../repositories/expcatalog/util/Initialize.java | 293 +++++++++++++++
.../api/service/handler/RegistryServerHandler.java | 334 +++++++----------
.../experiment-catalog-models/status_models.thrift | 12 +-
101 files changed, 8691 insertions(+), 2263 deletions(-)
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentSummaryEntity.java
rename modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/{workspacecatalog => expcatalog}/GatewayEntity.java (83%)
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerEntity.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayWorkerPK.java
copy modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/{JobStatusPK.java => JobPK.java} (50%)
rename modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/{workspacecatalog => expcatalog}/NotificationEntity.java (64%)
rename modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/{ProcessResourceSchedulingEntity.java => ProcessResourceScheduleEntity.java} (65%)
rename modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/{workspacecatalog => expcatalog}/ProjectEntity.java (77%)
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserEntity.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProjectUserPK.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusEntity.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/QueueStatusPK.java
rename modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/{ComputeResourceSchedulingEntity.java => UserConfigurationDataEntity.java} (53%)
delete mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExpCatAbstractRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepository.java
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepository.java
delete mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/GatewayRepository.java
delete mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/workspacecatalog/NotificationRepository.java
rename modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/{repositories/workspacecatalog/ProjectRepository.java => utils/ExpCatalogUtils.java} (53%)
create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtil/ExpCatalogJPAUtils.java
create mode 100644 modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
create mode 100644 modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
delete mode 100644 modules/registry-refactoring/src/main/resources/experiment_catalog.sql
delete mode 100644 modules/registry-refactoring/src/main/resources/workspace_catalog.sql
delete mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/ExperimentRepositoryTest.java
delete mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/WorkspaceRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepositoryTest.java
create mode 100644 modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/util/Initialize.java
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata] 01/02: Merge branch 'group-based-auth' of
https://github.com/tilaks26/airavata into tilaks26-group-based-auth
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit d198a31472ec1b188b7d608fd60f7a5d9d3d355f
Merge: 0c96efb bc5971d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 4 08:17:04 2018 -0400
Merge branch 'group-based-auth' of https://github.com/tilaks26/airavata into tilaks26-group-based-auth
.../airavata/model/status/ExperimentStatus.java | 113 +++++-
.../apache/airavata/model/status/JobStatus.java | 113 +++++-
.../airavata/model/status/ProcessStatus.java | 113 +++++-
.../apache/airavata/model/status/TaskStatus.java | 113 +++++-
.../core/entities/expcatalog/ExperimentEntity.java | 116 +++---
.../entities/expcatalog/ExperimentErrorEntity.java | 60 ++--
.../entities/expcatalog/ExperimentErrorPK.java | 52 +--
.../entities/expcatalog/ExperimentInputEntity.java | 93 +++--
.../entities/expcatalog/ExperimentInputPK.java | 51 +--
.../expcatalog/ExperimentOutputEntity.java | 78 ++--
.../entities/expcatalog/ExperimentOutputPK.java | 51 +--
.../expcatalog/ExperimentStatusEntity.java | 51 ++-
.../entities/expcatalog/ExperimentStatusPK.java | 61 ++--
.../expcatalog/ExperimentSummaryEntity.java | 158 ++++++++
.../GatewayEntity.java | 114 +++---
.../entities/expcatalog/GatewayWorkerEntity.java | 61 ++++
.../core/entities/expcatalog/GatewayWorkerPK.java | 75 ++++
.../core/entities/expcatalog/JobEntity.java | 72 ++--
.../expcatalog/{JobStatusPK.java => JobPK.java} | 66 ++--
.../core/entities/expcatalog/JobStatusEntity.java | 75 +++-
.../core/entities/expcatalog/JobStatusPK.java | 69 ++--
.../NotificationEntity.java | 68 ++--
.../core/entities/expcatalog/ProcessEntity.java | 159 +++++---
.../entities/expcatalog/ProcessErrorEntity.java | 61 ++--
.../core/entities/expcatalog/ProcessErrorPK.java | 52 +--
.../entities/expcatalog/ProcessInputEntity.java | 104 ++++--
.../core/entities/expcatalog/ProcessInputPK.java | 51 +--
.../entities/expcatalog/ProcessOutputEntity.java | 83 +++--
.../core/entities/expcatalog/ProcessOutputPK.java | 47 +--
...ity.java => ProcessResourceScheduleEntity.java} | 93 ++---
.../entities/expcatalog/ProcessStatusEntity.java | 51 ++-
.../core/entities/expcatalog/ProcessStatusPK.java | 61 ++--
.../ProjectEntity.java | 48 ++-
.../entities/expcatalog/ProjectUserEntity.java | 61 ++++
.../core/entities/expcatalog/ProjectUserPK.java | 75 ++++
.../entities/expcatalog/QueueStatusEntity.java | 109 ++++++
.../core/entities/expcatalog/QueueStatusPK.java | 89 +++++
.../core/entities/expcatalog/TaskEntity.java | 85 +++--
.../core/entities/expcatalog/TaskErrorEntity.java | 61 ++--
.../core/entities/expcatalog/TaskErrorPK.java | 52 +--
.../core/entities/expcatalog/TaskStatusEntity.java | 51 ++-
.../core/entities/expcatalog/TaskStatusPK.java | 61 ++--
...ntity.java => UserConfigurationDataEntity.java} | 185 ++++++++--
.../expcatalog/UserConfigurationEntity.java | 131 -------
.../expcatalog/ExpCatAbstractRepository.java | 111 ++++++
.../expcatalog/ExperimentErrorRepository.java | 76 ++++
.../expcatalog/ExperimentInputRepository.java | 71 ++++
.../expcatalog/ExperimentOutputRepository.java | 73 ++++
.../expcatalog/ExperimentRepository.java | 194 +++++++---
.../expcatalog/ExperimentStatusRepository.java | 103 ++++++
.../expcatalog/ExperimentSummaryRepository.java | 291 +++++++++++++++
.../repositories/expcatalog/GatewayRepository.java | 106 ++++++
.../repositories/expcatalog/JobRepository.java | 137 +++++++
.../expcatalog/JobStatusRepository.java | 107 ++++++
.../expcatalog/NotificationRepository.java | 104 ++++++
.../expcatalog/ProcessErrorRepository.java | 74 ++++
.../expcatalog/ProcessInputRepository.java | 71 ++++
.../expcatalog/ProcessOutputRepository.java | 71 ++++
.../repositories/expcatalog/ProcessRepository.java | 165 +++++++++
.../expcatalog/ProcessStatusRepository.java | 102 ++++++
.../repositories/expcatalog/ProjectRepository.java | 205 +++++++++++
.../expcatalog/QueueStatusRepository.java | 55 +++
.../expcatalog/TaskErrorRepository.java | 54 +++
.../repositories/expcatalog/TaskRepository.java | 133 +++++++
.../expcatalog/TaskStatusRepository.java | 79 ++++
.../workspacecatalog/GatewayRepository.java | 36 --
.../workspacecatalog/NotificationRepository.java | 35 --
.../airavata/registry/core/utils/DBConstants.java | 55 +++
.../ExpCatalogUtils.java} | 24 +-
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 84 +++++
.../registry/core/utils/QueryConstants.java | 33 ++
.../src/main/resources/META-INF/persistence.xml | 23 +-
.../src/main/resources/expcatalog-derby.sql | 397 ++++++++++++++++++++
.../src/main/resources/expcatalog-mysql.sql | 400 +++++++++++++++++++++
.../src/main/resources/experiment_catalog.sql | 285 ---------------
.../src/main/resources/workspace_catalog.sql | 125 -------
.../repositories/ExperimentRepositoryTest.java | 157 --------
.../core/repositories/WorkspaceRepositoryTest.java | 279 --------------
.../expcatalog/ExperimentErrorRepositoryTest.java | 113 ++++++
.../expcatalog/ExperimentInputRepositoryTest.java | 116 ++++++
.../expcatalog/ExperimentOutputRepositoryTest.java | 116 ++++++
.../expcatalog/ExperimentRepositoryTest.java | 121 +++++++
.../expcatalog/ExperimentStatusRepositoryTest.java | 110 ++++++
.../ExperimentSummaryRepositoryTest.java | 208 +++++++++++
.../expcatalog/GatewayRepositoryTest.java | 83 +++++
.../repositories/expcatalog/JobRepositoryTest.java | 147 ++++++++
.../expcatalog/JobStatusRepositoryTest.java | 148 ++++++++
.../expcatalog/NotificationRepositoryTest.java | 82 +++++
.../expcatalog/ProcessErrorRepositoryTest.java | 119 ++++++
.../expcatalog/ProcessInputRepositoryTest.java | 122 +++++++
.../expcatalog/ProcessOutputRepositoryTest.java | 123 +++++++
.../expcatalog/ProcessRepositoryTest.java | 127 +++++++
.../expcatalog/ProcessStatusRepositoryTest.java | 117 ++++++
.../expcatalog/ProjectRepositoryTest.java | 111 ++++++
.../expcatalog/QueueStatusRepositoryTest.java | 78 ++++
.../expcatalog/TaskErrorRepositoryTest.java | 131 +++++++
.../expcatalog/TaskRepositoryTest.java | 127 +++++++
.../expcatalog/TaskStatusRepositoryTest.java | 108 ++++++
.../repositories/expcatalog/util/Initialize.java | 293 +++++++++++++++
.../api/service/handler/RegistryServerHandler.java | 334 +++++++----------
.../experiment-catalog-models/status_models.thrift | 12 +-
101 files changed, 8691 insertions(+), 2263 deletions(-)
diff --cc modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index da49675,e979820..fce8997
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@@ -146,8 -158,7 +160,7 @@@ public class RegistryServerHandler impl
private DataProductRepository dataProductRepository = new DataProductRepository();
private DataReplicaLocationRepository dataReplicaLocationRepository = new DataReplicaLocationRepository();
private WorkflowRepository workflowRepository = new WorkflowRepository();
- private StorageResourceRepository storageResourceRepository = new StorageResourceRepository();
-
+ private GatewayGroupsRepository gatewayGroupsRepository = new GatewayGroupsRepository();
/**
* Fetch Apache Registry API version
@@@ -4900,78 -4806,5 +4808,78 @@@
}
}
+ @Override
+ public void createGatewayGroups(GatewayGroups gatewayGroups) throws RegistryServiceException, DuplicateEntryException, TException {
+ try {
+ if (gatewayGroupsRepository.isExists(gatewayGroups.getGatewayId())) {
+ logger.error("GatewayGroups already exists for " + gatewayGroups.getGatewayId());
+ throw new DuplicateEntryException("GatewayGroups for gatewayId: " + gatewayGroups.getGatewayId() + " already exists.");
+ }
+ gatewayGroupsRepository.create(gatewayGroups);
+ } catch (DuplicateEntryException e) {
+ throw e; // re-throw
+ } catch (Exception e) {
+
+ final String message = "Error while creating a GatewayGroups entry for gateway " + gatewayGroups.getGatewayId() + ".";
+ logger.error(message, e);
+ RegistryServiceException rse = new RegistryServiceException();
+ rse.setMessage(message + " More info: " + e.getMessage());
+ throw rse;
+ }
+ }
-}
+ @Override
+ public void updateGatewayGroups(GatewayGroups gatewayGroups) throws RegistryServiceException, TException {
+ try {
+ if (!gatewayGroupsRepository.isExists(gatewayGroups.getGatewayId())) {
+ final String message = "No GatewayGroups entry exists for " + gatewayGroups.getGatewayId();
+ logger.error(message);
+ throw new RegistryServiceException(message);
+ }
+ gatewayGroupsRepository.update(gatewayGroups);
+ } catch (RegistryServiceException e) {
+ throw e; // re-throw
+ } catch (Exception e) {
+
+ final String message = "Error while updating the GatewayGroups entry for gateway " + gatewayGroups.getGatewayId() + ".";
+ logger.error(message, e);
+ RegistryServiceException rse = new RegistryServiceException();
+ rse.setMessage(message + " More info: " + e.getMessage());
+ throw rse;
+ }
+ }
+
+ @Override
+ public boolean isGatewayGroupsExists(String gatewayId) throws RegistryServiceException, TException {
+ try {
+ return gatewayGroupsRepository.isExists(gatewayId);
+ } catch (Exception e) {
+ final String message = "Error checking existence of the GatewayGroups entry for gateway " + gatewayId + ".";
+ logger.error(message, e);
+ RegistryServiceException rse = new RegistryServiceException();
+ rse.setMessage(message + " More info: " + e.getMessage());
+ throw rse;
+ }
+ }
+
+ @Override
+ public GatewayGroups getGatewayGroups(String gatewayId) throws RegistryServiceException, TException {
+ try {
+ if (!gatewayGroupsRepository.isExists(gatewayId)) {
+ final String message = "No GatewayGroups entry exists for " + gatewayId;
+ logger.error(message);
+ throw new RegistryServiceException(message);
+ }
+ return gatewayGroupsRepository.get(gatewayId);
+ } catch (RegistryServiceException e) {
+ throw e; // re-throw
+ } catch (Exception e) {
+
+ final String message = "Error while retrieving the GatewayGroups entry for gateway " + gatewayId + ".";
+ logger.error(message, e);
+ RegistryServiceException rse = new RegistryServiceException();
+ rse.setMessage(message + " More info: " + e.getMessage());
+ throw rse;
+ }
+ }
- }
++}
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata] 02/02: Merge branch 'tilaks26-group-based-auth' into
group-based-auth
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 2d7227a63e1c52fbce709ae948ede5f0c9ca6237
Merge: 0c96efb d198a31
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 4 08:17:41 2018 -0400
Merge branch 'tilaks26-group-based-auth' into group-based-auth
.../airavata/model/status/ExperimentStatus.java | 113 +++++-
.../apache/airavata/model/status/JobStatus.java | 113 +++++-
.../airavata/model/status/ProcessStatus.java | 113 +++++-
.../apache/airavata/model/status/TaskStatus.java | 113 +++++-
.../core/entities/expcatalog/ExperimentEntity.java | 116 +++---
.../entities/expcatalog/ExperimentErrorEntity.java | 60 ++--
.../entities/expcatalog/ExperimentErrorPK.java | 52 +--
.../entities/expcatalog/ExperimentInputEntity.java | 93 +++--
.../entities/expcatalog/ExperimentInputPK.java | 51 +--
.../expcatalog/ExperimentOutputEntity.java | 78 ++--
.../entities/expcatalog/ExperimentOutputPK.java | 51 +--
.../expcatalog/ExperimentStatusEntity.java | 51 ++-
.../entities/expcatalog/ExperimentStatusPK.java | 61 ++--
.../expcatalog/ExperimentSummaryEntity.java | 158 ++++++++
.../GatewayEntity.java | 114 +++---
.../entities/expcatalog/GatewayWorkerEntity.java | 61 ++++
.../core/entities/expcatalog/GatewayWorkerPK.java | 75 ++++
.../core/entities/expcatalog/JobEntity.java | 72 ++--
.../expcatalog/{JobStatusPK.java => JobPK.java} | 66 ++--
.../core/entities/expcatalog/JobStatusEntity.java | 75 +++-
.../core/entities/expcatalog/JobStatusPK.java | 69 ++--
.../NotificationEntity.java | 68 ++--
.../core/entities/expcatalog/ProcessEntity.java | 159 +++++---
.../entities/expcatalog/ProcessErrorEntity.java | 61 ++--
.../core/entities/expcatalog/ProcessErrorPK.java | 52 +--
.../entities/expcatalog/ProcessInputEntity.java | 104 ++++--
.../core/entities/expcatalog/ProcessInputPK.java | 51 +--
.../entities/expcatalog/ProcessOutputEntity.java | 83 +++--
.../core/entities/expcatalog/ProcessOutputPK.java | 47 +--
...ity.java => ProcessResourceScheduleEntity.java} | 93 ++---
.../entities/expcatalog/ProcessStatusEntity.java | 51 ++-
.../core/entities/expcatalog/ProcessStatusPK.java | 61 ++--
.../ProjectEntity.java | 48 ++-
.../entities/expcatalog/ProjectUserEntity.java | 61 ++++
.../core/entities/expcatalog/ProjectUserPK.java | 75 ++++
.../entities/expcatalog/QueueStatusEntity.java | 109 ++++++
.../core/entities/expcatalog/QueueStatusPK.java | 89 +++++
.../core/entities/expcatalog/TaskEntity.java | 85 +++--
.../core/entities/expcatalog/TaskErrorEntity.java | 61 ++--
.../core/entities/expcatalog/TaskErrorPK.java | 52 +--
.../core/entities/expcatalog/TaskStatusEntity.java | 51 ++-
.../core/entities/expcatalog/TaskStatusPK.java | 61 ++--
...ntity.java => UserConfigurationDataEntity.java} | 185 ++++++++--
.../expcatalog/UserConfigurationEntity.java | 131 -------
.../expcatalog/ExpCatAbstractRepository.java | 111 ++++++
.../expcatalog/ExperimentErrorRepository.java | 76 ++++
.../expcatalog/ExperimentInputRepository.java | 71 ++++
.../expcatalog/ExperimentOutputRepository.java | 73 ++++
.../expcatalog/ExperimentRepository.java | 194 +++++++---
.../expcatalog/ExperimentStatusRepository.java | 103 ++++++
.../expcatalog/ExperimentSummaryRepository.java | 291 +++++++++++++++
.../repositories/expcatalog/GatewayRepository.java | 106 ++++++
.../repositories/expcatalog/JobRepository.java | 137 +++++++
.../expcatalog/JobStatusRepository.java | 107 ++++++
.../expcatalog/NotificationRepository.java | 104 ++++++
.../expcatalog/ProcessErrorRepository.java | 74 ++++
.../expcatalog/ProcessInputRepository.java | 71 ++++
.../expcatalog/ProcessOutputRepository.java | 71 ++++
.../repositories/expcatalog/ProcessRepository.java | 165 +++++++++
.../expcatalog/ProcessStatusRepository.java | 102 ++++++
.../repositories/expcatalog/ProjectRepository.java | 205 +++++++++++
.../expcatalog/QueueStatusRepository.java | 55 +++
.../expcatalog/TaskErrorRepository.java | 54 +++
.../repositories/expcatalog/TaskRepository.java | 133 +++++++
.../expcatalog/TaskStatusRepository.java | 79 ++++
.../workspacecatalog/GatewayRepository.java | 36 --
.../workspacecatalog/NotificationRepository.java | 35 --
.../airavata/registry/core/utils/DBConstants.java | 55 +++
.../ExpCatalogUtils.java} | 24 +-
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 84 +++++
.../registry/core/utils/QueryConstants.java | 33 ++
.../src/main/resources/META-INF/persistence.xml | 23 +-
.../src/main/resources/expcatalog-derby.sql | 397 ++++++++++++++++++++
.../src/main/resources/expcatalog-mysql.sql | 400 +++++++++++++++++++++
.../src/main/resources/experiment_catalog.sql | 285 ---------------
.../src/main/resources/workspace_catalog.sql | 125 -------
.../repositories/ExperimentRepositoryTest.java | 157 --------
.../core/repositories/WorkspaceRepositoryTest.java | 279 --------------
.../expcatalog/ExperimentErrorRepositoryTest.java | 113 ++++++
.../expcatalog/ExperimentInputRepositoryTest.java | 116 ++++++
.../expcatalog/ExperimentOutputRepositoryTest.java | 116 ++++++
.../expcatalog/ExperimentRepositoryTest.java | 121 +++++++
.../expcatalog/ExperimentStatusRepositoryTest.java | 110 ++++++
.../ExperimentSummaryRepositoryTest.java | 208 +++++++++++
.../expcatalog/GatewayRepositoryTest.java | 83 +++++
.../repositories/expcatalog/JobRepositoryTest.java | 147 ++++++++
.../expcatalog/JobStatusRepositoryTest.java | 148 ++++++++
.../expcatalog/NotificationRepositoryTest.java | 82 +++++
.../expcatalog/ProcessErrorRepositoryTest.java | 119 ++++++
.../expcatalog/ProcessInputRepositoryTest.java | 122 +++++++
.../expcatalog/ProcessOutputRepositoryTest.java | 123 +++++++
.../expcatalog/ProcessRepositoryTest.java | 127 +++++++
.../expcatalog/ProcessStatusRepositoryTest.java | 117 ++++++
.../expcatalog/ProjectRepositoryTest.java | 111 ++++++
.../expcatalog/QueueStatusRepositoryTest.java | 78 ++++
.../expcatalog/TaskErrorRepositoryTest.java | 131 +++++++
.../expcatalog/TaskRepositoryTest.java | 127 +++++++
.../expcatalog/TaskStatusRepositoryTest.java | 108 ++++++
.../repositories/expcatalog/util/Initialize.java | 293 +++++++++++++++
.../api/service/handler/RegistryServerHandler.java | 334 +++++++----------
.../experiment-catalog-models/status_models.thrift | 12 +-
101 files changed, 8691 insertions(+), 2263 deletions(-)
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.