Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 2c3a36886 -> c7ef13c1e
change passphrase to optional Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c7ef13c1 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c7ef13c1 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c7ef13c1 Branch: refs/heads/airavata-0.15-release-branch Commit: c7ef13c1e5420c7c75a500c5da9bf2c8d3211fdc Parents: 2c3a368 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Jul 16 14:08:08 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Jul 16 14:08:08 2015 -0400 ---------------------------------------------------------------------- .../airavata/api/server/handler/AiravataServerHandler.java | 4 ++-- .../cs-thrift-descriptions/credentialStoreDataModel.thrift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c7ef13c1/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 62d8e6f..7915e48 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -1781,8 +1781,8 @@ public class AiravataServerHandler implements Airavata.Iface { } private CredentialStoreService.Client getCredentialStoreServiceClient() throws TException{ - final int serverPort = Integer.parseInt(ServerSettings.getSetting(org.apache.airavata.common.utils.Constants.CREDENTIAL_SERVER_HOST,"8960")); - final String serverHost = ServerSettings.getSetting(org.apache.airavata.common.utils.Constants.CREDENTIAL_SERVER_PORT, null); + final int serverPort = Integer.parseInt(ServerSettings.getSetting(org.apache.airavata.common.utils.Constants.CREDENTIAL_SERVER_PORT,"8960")); + final String serverHost = ServerSettings.getSetting(org.apache.airavata.common.utils.Constants.CREDENTIAL_SERVER_HOST, null); try { return CredentialStoreClientFactory.createAiravataCSClient(serverHost, serverPort); } catch (CredentialStoreException e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/c7ef13c1/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift ---------------------------------------------------------------------- diff --git a/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift b/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift index ce4dc46..0f52833 100644 --- a/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift +++ b/modules/credential-store/cs-thrift-descriptions/credentialStoreDataModel.thrift @@ -29,7 +29,7 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" struct SSHCredential { 1: required string gatewayId, 2: required string username, - 3: required string passphrase, + 3: optional string passphrase, 4: optional string publicKey, 5: optional string privateKey, 6: optional i64 persistedTime,
