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 2019/09/03 13:43:40 UTC

[airavata-custos] 45/45: Merge pull request #5 from aarushiibisht/master

This is an automated email from the ASF dual-hosted git repository.

smarru pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git

commit 2e3135a92bf4b3c3c222f8e77c91fe7f067ab299
Merge: 469150f 409ac82
Author: Suresh Marru <sm...@apache.org>
AuthorDate: Tue Sep 3 09:42:51 2019 -0400

    Merge pull request #5 from aarushiibisht/master
    
    Merging into PR, still pending to do a good review of all API's and code bases

 .../handler/CustosAuthenticationHandler.java       |    2 +-
 ...ctory.java => AuthenticationServiceClient.java} |    2 +-
 custos-commons/pom.xml                             |    6 +
 .../exceptions/ServiceConnectionException.java     |   14 +
 .../org/apache/custos/commons/utils/Constants.java |    4 +
 .../custos/commons/utils/ServerSettings.java       |    7 +-
 .../custos/commons/utils/ServiceRequestClient.java |  101 ++
 .../src/main/resources/custos-server.properties    |    9 +
 custos-sharing-registry-service/README             |    3 +
 .../pom.xml                                        |   16 +-
 .../sharing-service-api}/pom.xml                   |   12 +-
 .../custos/sharing/service/api/AppConfig.java      |    7 +
 .../custos/sharing/service/api/Application.java    |   32 +
 .../api/constants/SharingRegistryEndpoints.java    |   88 ++
 .../service/api/controllers/AccessController.java  |   72 ++
 .../service/api/controllers/DomainsController.java |   84 ++
 .../service/api/controllers/EntityController.java  |  120 ++
 .../api/controllers/EntityTypeController.java      |  100 ++
 .../service/api/controllers/GroupController.java   |  269 +++++
 .../api/controllers/PermissionTypeController.java  |   98 ++
 .../service/api/controllers/UsersController.java   |   97 ++
 .../src/main/resources/application.properties      |    2 +
 .../sharing-service-core/pom.xml                   |   95 ++
 .../service/core/db/entities/DomainEntity.java     |  115 ++
 .../service/core/db/entities/EntityEntity.java     |  219 ++++
 .../sharing/service/core/db/entities/EntityPK.java |   76 ++
 .../service/core/db/entities/EntityTypeEntity.java |  130 +++
 .../service/core/db/entities/EntityTypePK.java     |   76 ++
 .../service/core/db/entities/GroupAdminEntity.java |   80 ++
 .../service/core/db/entities/GroupAdminPK.java     |   66 ++
 .../core/db/entities/GroupMembershipEntity.java    |  126 ++
 .../core/db/entities/GroupMembershipPK.java        |   88 ++
 .../core/db/entities/PermissionTypeEntity.java     |  128 +++
 .../service/core/db/entities/PermissionTypePK.java |   76 ++
 .../service/core/db/entities/SharingEntity.java    |  149 +++
 .../service/core/db/entities/SharingPK.java        |  116 ++
 .../service/core/db/entities/UserEntity.java       |  161 +++
 .../service/core/db/entities/UserGroupEntity.java  |  178 +++
 .../service/core/db/entities/UserGroupPK.java      |   75 ++
 .../sharing/service/core/db/entities/UserPK.java   |   75 ++
 .../core/db/repositories/AbstractRepository.java   |  169 +++
 .../core/db/repositories/DomainRepository.java     |   33 +
 .../core/db/repositories/EntityRepository.java     |  180 +++
 .../core/db/repositories/EntityTypeRepository.java |   34 +
 .../core/db/repositories/GroupAdminRepository.java |   17 +
 .../db/repositories/GroupMembershipRepository.java |  105 ++
 .../db/repositories/PermissionTypeRepository.java  |   52 +
 .../core/db/repositories/SharingRepository.java    |  114 ++
 .../core/db/repositories/UserGroupRepository.java  |   95 ++
 .../core/db/repositories/UserRepository.java       |   79 ++
 .../sharing/service/core/db/utils/Committer.java   |   26 +
 .../sharing/service/core/db/utils/DBConstants.java |  106 ++
 .../sharing/service/core/db/utils/JPAUtils.java    |   35 +
 .../core/db/utils/ObjectMapperSingleton.java       |   38 +
 .../core/db/utils/SharingRegistryDBInitConfig.java |   50 +
 .../core/db/utils/SharingRegistryJDBCConfig.java   |   67 ++
 .../core/exceptions/DuplicateEntryException.java   |   15 +
 .../core/exceptions/ResourceNotFoundException.java |   16 +
 .../core/exceptions/SharingRegistryException.java  |   16 +
 .../custos/sharing/service/core/models/Domain.java |   58 +
 .../custos/sharing/service/core/models/Entity.java |  136 +++
 .../service/core/models/EntitySearchField.java     |   14 +
 .../sharing/service/core/models/EntityType.java    |   69 ++
 .../sharing/service/core/models/GroupAdmin.java    |   33 +
 .../service/core/models/GroupCardinality.java      |    6 +
 .../service/core/models/GroupChildType.java        |    6 +
 .../service/core/models/GroupMembership.java       |   60 +
 .../sharing/service/core/models/GroupType.java     |    6 +
 .../service/core/models/PermissionType.java        |   69 ++
 .../service/core/models/SearchCondition.java       |   10 +
 .../service/core/models/SearchCriteria.java        |   31 +
 .../sharing/service/core/models/Sharing.java       |   78 ++
 .../sharing/service/core/models/SharingType.java   |    7 +
 .../custos/sharing/service/core/models/User.java   |  100 ++
 .../sharing/service/core/models/UserGroup.java     |  113 ++
 .../core/service/SharingRegistryService.java       | 1212 ++++++++++++++++++++
 .../src/main/resources/META-INF/persistence.xml    |   16 +
 .../database_scripts/sharing-registry-derby.sql    |  147 +++
 .../database_scripts/sharing-registry-mysql.sql    |  146 +++
 ...verStarted.java => CustosAPIServerStarter.java} |    2 +-
 .../database_scripts/init/01-databases.sql         |  327 +++++-
 .../database_scripts/sharing-registry-mysql.sql    |  146 +++
 ide-integration/pom.xml                            |    8 +-
 .../custos-authentication-service-samples/pom.xml  |    2 +-
 .../sample/CustosAuthenticationServiceSample.java  |    4 +-
 .../samples/custos-profile-service-samples/pom.xml |    2 +-
 pom.xml                                            |    8 +
 87 files changed, 7212 insertions(+), 25 deletions(-)