You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/02/13 16:12:15 UTC
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
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/e31e00d4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e31e00d4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e31e00d4
Branch: refs/heads/master
Commit: e31e00d48f6f8079408e7b99606f2e6deccd8b86
Parents: 6555180 e59e25e
Author: chathuri <ch...@apache.org>
Authored: Wed Feb 12 16:42:58 2014 -0500
Committer: chathuri <ch...@apache.org>
Committed: Wed Feb 12 16:42:58 2014 -0500
----------------------------------------------------------------------
.../airavata/api/server/AiravataServer.java | 1 +
.../monitoringModel.thrift | 8 +-
modules/gfac/gfac-core/pom.xml | 95 ++++---
.../java/org/apache/airavata/gfac/cpi/GFac.java | 132 +++++++++
.../apache/airavata/gfac/utils/GFacUtils.java | 56 ++--
modules/orchestrator/orchestrator-core/pom.xml | 5 +
.../core/OrchestratorConfiguration.java | 10 +
.../core/impl/EmbeddedGFACJobSubmitter.java | 115 ++------
.../orchestrator/core/job/JobSubmitter.java | 6 +-
.../core/utils/OrchestratorConstants.java | 1 +
.../core/utils/OrchestratorUtils.java | 33 +--
.../airavata/orchestrator/cpi/Orchestrator.java | 45 +--
.../cpi/impl/AbstractOrchestrator.java | 24 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 111 +-------
.../src/main/resources/orchestrator.properties | 1 +
.../orchestrator/core/NewOrchestratorTest.java | 276 +++++++++----------
.../src/test/resources/orchestrator.properties | 3 +-
.../registry/jpa/impl/AiravataJPARegistry.java | 14 -
.../airavata/registry/api/JobRequest.java | 134 ---------
.../registry/api/OrchestratorRegistry.java | 16 --
20 files changed, 411 insertions(+), 675 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e31e00d4/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java
index 5ee8443,7a246ee..a09986e
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java
@@@ -41,9 -40,9 +41,10 @@@ public class AiravataServer
//FIXME: Read the port from airavata-server.config file
private static final int THRIFT_SERVER_PORT = 8930;
+
public static void StartAiravataServer(Airavata.Processor<MockAiravataServerHandler> mockAiravataServer) throws AiravataSystemException {
try {
+ RegistryInitUtil.initializeDB();
TServerTransport serverTransport = new TServerSocket(THRIFT_SERVER_PORT);
TServer server = new TSimpleServer(
new TServer.Args(serverTransport).processor(mockAiravataServer));