You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/06/18 18:00:57 UTC
[4/4] airavata git commit: Resolve merge confilict,
used SeverSetting methods instead of constant to get settings
Resolve merge confilict, used SeverSetting methods instead of constant to get settings
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a6c7a1f7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a6c7a1f7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a6c7a1f7
Branch: refs/heads/master
Commit: a6c7a1f71fddf4d7f4462ed9172ecca20b6356e8
Parents: cc4286b 2d9ea1f
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Thu Jun 18 12:00:40 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Thu Jun 18 12:00:40 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/common/utils/Constants.java | 5 --
.../store/server/CredentialStoreServer.java | 3 -
.../credential/store/client/TestSSLClient.java | 1 -
.../apache/airavata/gfac/core/GFacUtils.java | 77 +++++++++++---------
.../gfac/impl/task/SSHJobSubmissionTask.java | 71 +++++++++++++++++-
5 files changed, 112 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a6c7a1f7/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
----------------------------------------------------------------------
diff --cc modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
index 3e32bc1,3439e00..146906a
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
@@@ -66,13 -66,13 +66,10 @@@ public class CredentialStoreServer imp
new TSSLTransportFactory.TSSLTransportParameters();
String keystorePath = ServerSettings.getCredentialStoreThriftServerKeyStorePath();
String keystorePWD = ServerSettings.getCredentialStoreThriftServerKeyStorePassword();
- final int serverPort = Integer.parseInt(ServerSettings.getSetting(ServerSettings.CREDENTIAL_SERVER_PORT, "8960"));
- final String serverHost = ServerSettings.getSetting(ServerSettings.CREDENTIAL_SERVER_HOST, null);
+ final int serverPort = Integer.parseInt(ServerSettings.getCredentialStoreServerPort());
+ final String serverHost = ServerSettings.getCredentialStoreServerHost();
params.setKeyStore(keystorePath, keystorePWD);
--
TServerSocket serverTransport = TSSLTransportFactory.getServerSocket(serverPort, 100, InetAddress.getByName(serverHost), params);
--
--
CredentialStoreService.Processor processor = new CredentialStoreService.Processor(new CredentialStoreServerHandler());
server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).
http://git-wip-us.apache.org/repos/asf/airavata/blob/a6c7a1f7/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
----------------------------------------------------------------------
diff --cc modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
index 7690449,fa19ea4..0707348
--- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
+++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
@@@ -55,9 -55,9 +55,8 @@@ public class TestSSLClient
String keystorePath = ServerSettings.getCredentialStoreThriftServerKeyStorePath();
String keystorePWD = ServerSettings.getCredentialStoreThriftServerKeyStorePassword();
params.setTrustStore(keystorePath, keystorePWD);
- final int serverPort = Integer.parseInt(ServerSettings.getSetting(ServerSettings.CREDENTIAL_SERVER_PORT, "8960"));
- final String serverHost = ServerSettings.getSetting(ServerSettings.CREDENTIAL_SERVER_HOST, null);
-
+ final int serverPort = Integer.parseInt(ServerSettings.getCredentialStoreServerPort());
+ final String serverHost = ServerSettings.getCredentialStoreServerHost();
-
transport = TSSLTransportFactory.getClientSocket(serverHost, serverPort, 10000, params);
TProtocol protocol = new TBinaryProtocol(transport);