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 <[email protected]> Authored: Thu Oct 16 15:54:28 2014 -0400 Committer: raminder <[email protected]> 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(-) ----------------------------------------------------------------------
