merge PR #83
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a94a7ca9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a94a7ca9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a94a7ca9 Branch: refs/heads/develop Commit: a94a7ca9da12ccb698cf1dfc9716bccd35472437 Parents: 49afd99 c1b696b Author: Shameera Rathnayaka <[email protected]> Authored: Tue Dec 13 11:10:58 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Dec 13 11:10:58 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 70 +- .../DefaultAiravataSecurityManager.java | 2 +- .../java/org/apache/airavata/api/Airavata.java | 804 +++++++---- .../credentialsummary/CredentialSummary.java | 927 ------------- .../credential/store/CertificateCredential.java | 1142 +++++++++++++++ .../model/credential/store/CommunityUser.java | 608 ++++++++ .../credential/store/CredentialOwnerType.java | 62 + .../credential/store/CredentialSummary.java | 1040 ++++++++++++++ .../credential/store/PasswordCredential.java | 1028 ++++++++++++++ .../model/credential/store/SSHCredential.java | 1265 +++++++++++++++++ .../credential/store/SSHCredentialSummary.java | 927 +++++++++++++ .../model/credential/store/SummaryType.java | 69 + .../credential_store_data_modelsConstants.java | 58 + .../monitoring/ClusterStatusMonitorJob.java | 2 +- .../store/credential/CredentialOwnerType.java | 12 +- .../server/CredentialStoreServerHandler.java | 145 +- .../credential/store/client/TestSSLClient.java | 6 +- .../store/cpi/CredentialStoreService.java | 1297 +++++++++++------- .../store/datamodel/APICredential.java | 723 ---------- .../store/datamodel/CertificateCredential.java | 1149 ---------------- .../store/datamodel/CommunityUser.java | 609 -------- .../store/datamodel/CredentialOwnerType.java | 61 - .../store/datamodel/PasswordCredential.java | 1032 -------------- .../store/datamodel/SSHCredential.java | 1277 ----------------- .../store/datamodel/SSHCredentialSummary.java | 931 ------------- .../credential_store_data_modelsConstants.java | 57 - .../airavata-apis/airavata_api.thrift | 36 +- .../component-cpis/credential-store-cpi.thrift | 15 +- .../data-models/airavata_data_models.thrift | 1 + .../credential_store_data_models.thrift | 27 +- .../credential_summary.thrift | 33 - .../resource_catalog_models.thrift | 3 +- 32 files changed, 7731 insertions(+), 7687 deletions(-) ----------------------------------------------------------------------
