Merge branch 'AIRAVATA-2232-CredentialOwnerType' of https://github.com/machristie/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d678f4fc Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d678f4fc Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d678f4fc Branch: refs/heads/develop Commit: d678f4fc1e7417461d20b8b1425d8b689233e67a Parents: 26e832d 2e05c23 Author: scnakandala <[email protected]> Authored: Tue Nov 29 14:08:48 2016 -0500 Committer: scnakandala <[email protected]> Committed: Tue Nov 29 14:08:48 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 28 +- airavata-api/airavata-api-stubs/pom.xml | 7 +- .../java/org/apache/airavata/api/Airavata.java | 1806 +++--------------- .../resources/lib/Airavata/API/Airavata.php | 409 +--- .../Airavata/Model/Credential/Store/Types.php | 32 + .../credential/store/credential/Credential.java | 4 + .../store/credential/CredentialOwnerType.java | 28 + .../server/CredentialStoreServerHandler.java | 12 +- .../store/store/impl/db/CredentialsDAO.java | 15 +- .../store/store/impl/db/CredentialsDAOTest.java | 7 + .../credential-store-stubs/pom.xml | 24 + .../store/cpi/CredentialStoreService.java | 2 +- .../store/datamodel/APICredential.java | 2 +- .../store/datamodel/CertificateCredential.java | 2 +- .../store/datamodel/CommunityUser.java | 2 +- .../store/datamodel/CredentialOwnerType.java | 61 + .../store/datamodel/PasswordCredential.java | 2 +- .../store/datamodel/SSHCredential.java | 136 +- .../store/datamodel/SSHCredentialSummary.java | 2 +- .../exception/CredentialStoreException.java | 2 +- .../src/main/resources/credstore-derby.sql | 2 + .../src/main/resources/credstore-mysql.sql | 2 + .../airavata-apis/airavata_api.thrift | 38 +- .../credential_store_data_models.thrift | 8 +- .../generate-thrift-stubs.sh | 24 - 25 files changed, 635 insertions(+), 2022 deletions(-) ----------------------------------------------------------------------
