airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 07/07: Merge branch 'AIRAVATA-2840-group-based-auth-credential-tokens' into develop
Date Mon, 24 Sep 2018 16:55:44 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit eb9b63e2738fa97ee4a38b7e81738965f62b9728
Merge: 100f761 0afc1d9
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Mon Sep 24 12:55:21 2018 -0400

    Merge branch 'AIRAVATA-2840-group-based-auth-credential-tokens' into develop

 .gitignore                                         |    7 +-
 .../api/server/handler/AiravataServerHandler.java  |  280 +-
 .../java/org/apache/airavata/api/Airavata.java     | 8337 ++++----------------
 .../main/resources/lib/Airavata/API/Airavata.php   | 7147 ++++++++---------
 .../API/Sharing/SharingRegistryService.php         |    1 +
 .../lib/Airavata/Model/Credential/Store/Types.php  |   32 -
 .../resources/lib/Airavata/Model/Group/Types.php   |    6 +-
 .../resources/lib/Airavata/Model/Sharing/Types.php |   52 +
 .../main/resources/lib/Airavata/Model/Types.php    | 1111 ---
 .../resources/lib/airavata/api/Airavata-remote     |   53 +-
 .../main/resources/lib/airavata/api/Airavata.py    | 2947 +++----
 .../lib/airavata/model/credential/store/ttypes.py  |   29 +-
 .../resources/lib/airavata/model/group/ttypes.py   |    9 +-
 .../model/credential/store/SSHCredential.java      |  128 +-
 .../apache/airavata/model/group/ResourceType.java  |    5 +-
 .../credential/store/credential/Credential.java    |    1 +
 .../store/credential/CredentialOwnerType.java      |    1 +
 .../store/server/CredentialStoreServerHandler.java |  154 +-
 .../credential/store/store/CredentialReader.java   |    2 +
 .../store/store/impl/CredentialReaderImpl.java     |   11 +
 .../store/store/impl/db/CredentialsDAO.java        |   32 +-
 .../store/store/impl/db/CredentialsDAOTest.java    |   31 +-
 .../credential/store/client/TestSSLClient.java     |    8 +-
 .../store/cpi/CredentialStoreService.java          | 4785 +++++------
 .../migrator/airavata/AiravataDataMigrator.java    |   75 +
 .../messaging/SharingServiceDBEventHandler.java    |    8 +
 .../airavata-apis/airavata_api.thrift              |  126 +-
 .../component-cpis/credential-store-cpi.thrift     |   26 +-
 .../credential_store_data_models.thrift            |    6 -
 .../group_manager_model.thrift                     |    1 +
 30 files changed, 8477 insertions(+), 16934 deletions(-)



Mime
View raw message