airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject airavata git commit: adding registry server to startup
Date Tue, 17 Jan 2017 20:43:38 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 387d5c6e3 -> 485e71072


adding registry server to startup


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/485e7107
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/485e7107
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/485e7107

Branch: refs/heads/develop
Commit: 485e71072bea0ee7b8a4ca949f87f0f17aad2dd5
Parents: 387d5c6
Author: Suresh Marru <smarru@apache.org>
Authored: Tue Jan 17 15:43:32 2017 -0500
Committer: Suresh Marru <smarru@apache.org>
Committed: Tue Jan 17 15:43:32 2017 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/airavata/server/ServerMain.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/485e7107/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 0ff5744..1e67e8d 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -118,10 +118,11 @@ public class ServerMain {
 			serverList.add(API_SERVER);
 			serverList.add(ORCHESTRATOR);
 			serverList.add(GFAC_SERVER);
-			serverList.add(USER_PROFILE);
+			// serverList.add(USER_PROFILE); // Commenting temporarily since there is no current usage
 		} else if (serverList.indexOf(API_ORCH) > -1) {
 			serverList.clear();
-			serverList.add(CREDENTIAL_STORE);
+            serverList.add(REGISTRY_SERVER);  // registry server should start before everything
+            serverList.add(CREDENTIAL_STORE); // credential store should start before api
server
 			serverList.add(API_SERVER);
 			serverList.add(ORCHESTRATOR);
 		} else if (serverList.indexOf(EXECUTION) > -1) {


Mime
View raw message