Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 17578178AE for ; Thu, 16 Oct 2014 19:54:45 +0000 (UTC) Received: (qmail 95800 invoked by uid 500); 16 Oct 2014 19:54:45 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 95754 invoked by uid 500); 16 Oct 2014 19:54:45 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 95744 invoked by uid 99); 16 Oct 2014 19:54:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 19:54:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 80303A084A3; Thu, 16 Oct 2014 19:54:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: raminder@apache.org To: commits@airavata.apache.org Date: Thu, 16 Oct 2014 19:54:45 -0000 Message-Id: <98a6b5ef47f2424fa25f657b6f9076eb@git.apache.org> In-Reply-To: <0a01090e38b146dfa0e356836bf27a60@git.apache.org> References: <0a01090e38b146dfa0e356836bf27a60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/82da3d2a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/82da3d2a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/82da3d2a Branch: refs/heads/master Commit: 82da3d2a77ca94dfa623a7c985bf43cc2e1e0586 Parents: 589c71c 0c981d6 Author: raminder Authored: Thu Oct 16 15:54:28 2014 -0400 Committer: raminder Committed: Thu Oct 16 15:54:28 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 134 ++++++----- .../airavata/messaging/core/MessageHandler.java | 2 +- .../messaging/core/MessagingConstants.java | 3 + .../airavata/messaging/core/TestClient.java | 15 +- .../messaging/core/impl/RabbitMQConsumer.java | 131 +++++++---- .../messaging/core/impl/RabbitMQProducer.java | 2 +- .../messaging/core/impl/RabbitMQPublisher.java | 8 +- .../airavata/xbaya/messaging/EventData.java | 44 ++-- .../xbaya/messaging/EventDataRepository.java | 8 +- .../airavata/xbaya/messaging/MessageClient.java | 220 ------------------- .../airavata/xbaya/messaging/Monitor.java | 139 +++++------- 11 files changed, 271 insertions(+), 435 deletions(-) ----------------------------------------------------------------------