airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata git commit: Adding Sharing Registry back to all/api-orch server lists
Date Mon, 10 Apr 2017 15:47:24 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 4eb4bc37b -> 6c38ebb3e


Adding Sharing Registry back to all/api-orch server lists


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

Branch: refs/heads/develop
Commit: 6c38ebb3e4989fcd65f227569753a3819beedb30
Parents: 4eb4bc3
Author: Marcus Christie <machristie@apache.org>
Authored: Mon Apr 10 11:45:57 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Mon Apr 10 11:45:57 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/airavata/blob/6c38ebb3/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 17b133f..5a1cd06 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
@@ -60,7 +60,7 @@ public class ServerMain {
 	private static final String API_SERVER = "apiserver";
 	private static final String CREDENTIAL_STORE = "credentialstore";
 	private static final String REGISTRY_SERVER = "regserver";
-	//private static final String SHARING_SERVER = "sharing_server";
+	private static final String SHARING_SERVER = "sharing_server";
 	private static final String GFAC_SERVER = "gfac";
 	private static final String ORCHESTRATOR = "orchestrator";
 	private static final String USER_PROFILE = "user_profile";
@@ -116,7 +116,7 @@ public class ServerMain {
 			serverList.clear();
 			serverList.add(REGISTRY_SERVER);  // registry server should start before everything
 			serverList.add(CREDENTIAL_STORE); // credential store should start before api server
-			//serverList.add(SHARING_SERVER);
+			serverList.add(SHARING_SERVER);
 			serverList.add(API_SERVER);
 			serverList.add(ORCHESTRATOR);
 			serverList.add(GFAC_SERVER);
@@ -126,7 +126,7 @@ public class ServerMain {
 			serverList.clear();
             serverList.add(REGISTRY_SERVER);  // registry server should start before everything
             serverList.add(CREDENTIAL_STORE); // credential store should start before api
server
-			//serverList.add(SHARING_SERVER);
+			serverList.add(SHARING_SERVER);
 			serverList.add(API_SERVER);
 			serverList.add(ORCHESTRATOR);
 		} else if (serverList.indexOf(EXECUTION) > -1) {


Mime
View raw message