Repository: airavata Updated Branches: refs/heads/master fb7f49154 -> 3c19939ba
removing registry start in app catalog Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3c19939b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3c19939b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3c19939b Branch: refs/heads/master Commit: 3c19939ba1ff220eaffa03c4781bc8800a101e58 Parents: fb7f491 Author: Saminda Wijeratne <[email protected]> Authored: Fri May 23 06:15:37 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Fri May 23 06:15:37 2014 -0700 ---------------------------------------------------------------------- .../org/apache/airavata/api/server/ApplicationCatalogServer.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3c19939b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java index cb4a9ac..c470af0 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java @@ -24,7 +24,6 @@ package org.apache.airavata.api.server; import org.apache.airavata.api.appcatalog.ApplicationCatalogAPI; import org.apache.airavata.api.server.handler.ApplicationCatalogHandler; import org.apache.airavata.api.server.util.Constants; -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; @@ -55,14 +54,12 @@ public class ApplicationCatalogServer implements IServer{ public void StartAiravataServer(ApplicationCatalogAPI.Processor<ApplicationCatalogAPI.Iface> appCatalogServerHandler) throws AiravataSystemException { try { AiravataUtils.setExecutionAsServer(); - RegistryInitUtil.initializeDB(); final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.APP_CATALOG_SERVER_PORT,"8931")); TServerTransport serverTransport = new TServerSocket(serverPort); server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(appCatalogServerHandler)); new Thread() { public void run() { server.serve(); - RegistryInitUtil.stopDerbyInServerMode(); setStatus(ServerStatus.STOPPED); logger.info("Airavata API Server Stopped."); } @@ -86,7 +83,6 @@ public class ApplicationCatalogServer implements IServer{ } catch (TTransportException e) { logger.error(e.getMessage()); setStatus(ServerStatus.FAILED); - RegistryInitUtil.stopDerbyInServerMode(); throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR); } }
