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/08/31 17:56:55 UTC
[1/2] airavata git commit: Updage apiserver property constants to
match with airavata-server.properties file configurations
Repository: airavata
Updated Branches:
refs/heads/master dded7acff -> d8761f07b
Updage apiserver property constants to match with airavata-server.properties file configurations
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/99abcafa
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/99abcafa
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/99abcafa
Branch: refs/heads/master
Commit: 99abcafa3c08fae65a9b9c7e7aa1a4487c4b40dc
Parents: 555b0ad
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Mon Aug 31 11:56:25 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Mon Aug 31 11:56:25 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/server/util/Constants.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/99abcafa/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
index 4a08433..22e27f2 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/Constants.java
@@ -22,8 +22,9 @@
package org.apache.airavata.api.server.util;
public class Constants {
- public static final String API_SERVER_PORT = "apiserver.server.port";
- public static final String API_SERVER_HOST = "apiserver.server.host";
+ public static final String API_SERVER_PORT = "apiserver.port";
+ public static final String API_SERVER_HOST = "apiserver.host";
+ public static final String API_SERVER_NAME = "apiserver.name";
public static final String WORKFLOW_SERVER_PORT = "workflow.server.port";
public static final String WORKFLOW_SERVER_HOST = "workflow.server.host";
public static final String API_SERVER_MIN_THREADS = "apiserver.server.min.threads";
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d8761f07
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8761f07
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8761f07
Branch: refs/heads/master
Commit: d8761f07b089a3b8020871c2613f40a08a28c531
Parents: 99abcaf dded7ac
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Mon Aug 31 11:56:45 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Mon Aug 31 11:56:45 2015 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 20 ++++++++++++++----
.../airavata/common/utils/ServerSettings.java | 22 +++++++++++++-------
.../main/resources/airavata-server.properties | 7 +++++++
3 files changed, 37 insertions(+), 12 deletions(-)
----------------------------------------------------------------------