Return-Path: X-Original-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-airavata-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A70499C5 for ; Fri, 23 Sep 2011 20:19:11 +0000 (UTC) Received: (qmail 99637 invoked by uid 500); 23 Sep 2011 20:19:11 -0000 Delivered-To: apmail-incubator-airavata-commits-archive@incubator.apache.org Received: (qmail 99598 invoked by uid 500); 23 Sep 2011 20:19:11 -0000 Mailing-List: contact airavata-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: airavata-dev@incubator.apache.org Delivered-To: mailing list airavata-commits@incubator.apache.org Received: (qmail 99590 invoked by uid 99); 23 Sep 2011 20:19:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2011 20:19:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2011 20:19:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7DC9023888FD; Fri, 23 Sep 2011 20:18:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1174998 - /incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Date: Fri, 23 Sep 2011 20:18:47 -0000 To: airavata-commits@incubator.apache.org From: patanachai@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110923201847.7DC9023888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: patanachai Date: Fri Sep 23 20:18:47 2011 New Revision: 1174998 URL: http://svn.apache.org/viewvc?rev=1174998&view=rev Log: AIRAVATA-101 add queue initialization Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1174998&r1=1174997&r2=1174998&view=diff ============================================================================== --- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original) +++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Fri Sep 23 20:18:47 2011 @@ -29,7 +29,6 @@ import org.apache.airavata.wsmg.commons. import org.apache.airavata.wsmg.commons.config.ConfigurationManager; import org.apache.airavata.wsmg.commons.storage.WsmgInMemoryStorage; import org.apache.airavata.wsmg.commons.storage.WsmgPersistantStorage; -import org.apache.airavata.wsmg.commons.storage.WsmgStorage; import org.apache.airavata.wsmg.commons.util.Axis2Utils; import org.apache.airavata.wsmg.config.WSMGParameter; import org.apache.airavata.wsmg.config.WsmgConfigurationContext; @@ -91,20 +90,22 @@ public class BrokerServiceLifeCycle impl /* * Determine Storage */ - WsmgStorage storage = null; - if (WsmgCommonConstants.STORAGE_TYPE_IN_MEMORY.equalsIgnoreCase(type)) { - storage = new WsmgInMemoryStorage(); + WsmgInMemoryStorage inmem = new WsmgInMemoryStorage(); + + wsmgConfig.setStorage(inmem); + wsmgConfig.setQueue(inmem); + wsmgConfig.setSubscriptionManager(new SubscriptionManager(wsmgConfig, inmem)); + } else { String jdbcUrl = configMan.getConfig(WsmgCommonConstants.CONFIG_JDBC_URL); String jdbcDriver = configMan.getConfig(WsmgCommonConstants.CONFIG_JDBC_DRIVER); - storage = new WsmgPersistantStorage(jdbcUrl, jdbcDriver); - } - - wsmgConfig.setStorage(storage); - - SubscriptionManager subManager = new SubscriptionManager(wsmgConfig, storage); - wsmgConfig.setSubscriptionManager(subManager); + WsmgPersistantStorage persis = new WsmgPersistantStorage(jdbcUrl, jdbcDriver); + + wsmgConfig.setStorage(persis); + wsmgConfig.setQueue(persis); + wsmgConfig.setSubscriptionManager(new SubscriptionManager(wsmgConfig, persis)); + } NotificationProcessor notificatonProcessor = new NotificationProcessor(wsmgConfig); wsmgConfig.setNotificationProcessor(notificatonProcessor);