You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/03/06 21:38:12 UTC
[1/2] git commit: refactor to read the port from config file
Repository: airavata
Updated Branches:
refs/heads/master 59dcfaa41 -> f986e09c1
refactor to read the port from config file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/65d26eb2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/65d26eb2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/65d26eb2
Branch: refs/heads/master
Commit: 65d26eb2b5dcc6674c393f339c467dd5dcd6befb
Parents: f452dab
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Thu Mar 6 15:12:25 2014 -0500
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Thu Mar 6 15:12:25 2014 -0500
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/65d26eb2/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
index 68bdd03..f148ea3 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
@@ -28,6 +28,7 @@ import org.apache.airavata.api.server.handler.AiravataServerHandler;
import org.apache.airavata.api.server.util.RegistryInitUtil;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.IServer;
+import org.apache.airavata.common.utils.ServerSettings;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TSimpleServer;
import org.apache.thrift.transport.TServerSocket;
@@ -41,7 +42,7 @@ public class AiravataAPIServer implements IServer{
private final static Logger logger = LoggerFactory.getLogger(AiravataAPIServer.class);
//FIXME: Read the port from airavata-server.config file
- private static final int THRIFT_SERVER_PORT = 8930;
+ private static final String THRIFT_SERVER_PORT = "apiserver.server.port";
private ServerStatus status;
private TSimpleServer server;
@@ -54,7 +55,7 @@ public class AiravataAPIServer implements IServer{
try {
AiravataUtils.setExecutionAsServer();
RegistryInitUtil.initializeDB();
- TServerTransport serverTransport = new TServerSocket(THRIFT_SERVER_PORT);
+ TServerTransport serverTransport = new TServerSocket(Integer.parseInt(ServerSettings.getSetting(THRIFT_SERVER_PORT,"8930")));
server = new TSimpleServer(
new TServer.Args(serverTransport).processor(mockAiravataServer));
logger.info("Starting Airavata Mock Airavata Server on Port " + THRIFT_SERVER_PORT);
@@ -63,6 +64,8 @@ public class AiravataAPIServer implements IServer{
public void run() {
server.serve();
RegistryInitUtil.stopDerbyInServerMode();
+ setStatus(ServerStatus.STOPPED);
+ logger.info("Airavata API Server Stopped.");
}
}.start();
setStatus(ServerStatus.STARTED);
@@ -78,15 +81,6 @@ public class AiravataAPIServer implements IServer{
try {
AiravataAPIServer server = new AiravataAPIServer();
server.start();
-// System.out.println(server.getStatus()+":"+server.getStatus().getTime());
-// Thread.sleep(3000);
-// server.stop();
-// System.out.println(server.getStatus()+":"+server.getStatus().getTime());
-// Thread.sleep(3000);
-// server.start();
-// System.out.println(server.getStatus()+":"+server.getStatus().getTime());
-// Thread.sleep(3000);
-// server.stop();
} catch (Exception e) {
e.printStackTrace();
}
@@ -104,8 +98,6 @@ public class AiravataAPIServer implements IServer{
public void stop() throws Exception {
if (server.isServing()){
server.stop();
- setStatus(ServerStatus.STOPPED);
- logger.info("Airavata API Server Stopped.");
}
}
[2/2] git commit: refactor to read the port from config file
Posted by sa...@apache.org.
refactor to read the port from config file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f986e09c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f986e09c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f986e09c
Branch: refs/heads/master
Commit: f986e09c14c098c7d4c7b4e40a228e219d059f5c
Parents: 65d26eb 59dcfaa
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Thu Mar 6 15:37:51 2014 -0500
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Thu Mar 6 15:37:51 2014 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 2 +
.../api/server/util/RegistryInitUtil.java | 2 +-
.../main/resources/airavata-server.properties | 2 +-
.../src/main/resources/registry-mysql.sql | 2 +-
.../client/samples/CreateLaunchExperiment.java | 48 ++-
.../airavata/client/tools/DocumentCreator.java | 6 +-
modules/distribution/airavata-server/pom.xml | 5 +
.../src/main/assembly/bin-assembly.xml | 1 +
.../resources/conf/airavata-server.properties | 2 +-
.../gfac/provider/impl/LocalProvider.java | 9 +-
.../client/OrchestratorClientFactoryTest.java | 6 +-
.../client/sample/OrchestratorClientSample.java | 2 +-
.../orchestrator/core/BaseOrchestratorTest.java | 7 +-
.../jpa/resources/TaskDetailResource.java | 2 +-
.../registry/jpa/resources/Utils.java | 4 +-
.../main/resources/airavata-registry-derby.sql | 325 ----------------
.../main/resources/airavata-registry-mysql.sql | 327 ----------------
.../src/main/resources/provenance.sql | 73 ----
.../src/main/resources/registry-mysql.sql | 2 +-
.../test/resources/airavata-registry-derby.sql | 376 -------------------
test.git | 1 -
21 files changed, 78 insertions(+), 1126 deletions(-)
----------------------------------------------------------------------