merging develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/779cc376 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/779cc376 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/779cc376 Branch: refs/heads/lahiru/AIRAVATA-2057 Commit: 779cc376ef7c25a60586214cd7bb06056fdaaf79 Parents: 67102da b284167 Author: scnakandala <[email protected]> Authored: Wed Aug 17 11:14:20 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Aug 17 11:14:20 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 13 ++--- .../org/apache/airavata/gfac/impl/Factory.java | 14 +++-- .../airavata/gfac/server/GfacServerHandler.java | 5 +- .../messaging/core/MessagingFactory.java | 6 +-- .../messaging/core/impl/RabbitMQPublisher.java | 2 +- .../messaging/core/impl/RabbitMQSubscriber.java | 4 +- .../server/OrchestratorServerHandler.java | 56 +++++++++++++++----- 7 files changed, 70 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
