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:15 UTC

[airavata] 02/02: Merge branch 'tilaks26-group-based-auth' into group-based-auth

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.