Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b9b2480c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b9b2480c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b9b2480c Branch: refs/heads/lahiru/AIRAVATA-2057 Commit: b9b2480c5d68dc77d94aecca305e21604865962a Parents: 1eb3b41 63696ff Author: scnakandala <[email protected]> Authored: Thu Aug 11 12:44:54 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Aug 11 12:44:54 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 5 +- .../airavata/common/utils/ServerSettings.java | 10 - .../main/resources/airavata-server.properties | 1 - .../org/apache/airavata/gfac/impl/Factory.java | 9 +- .../airavata/gfac/server/GfacServerHandler.java | 6 +- .../messaging/client/RabbitMQListener.java | 3 +- .../messaging/core/MessagingFactory.java | 86 +++- .../airavata/messaging/core/Publisher.java | 4 +- .../messaging/core/PublisherFactory.java | 138 +++--- .../messaging/core/RabbitMQProperties.java | 125 ++++++ .../airavata/messaging/core/Subscriber.java | 5 - .../messaging/core/SubscriberProperties.java | 125 ------ .../airavata/messaging/core/TestClient.java | 2 +- .../apache/airavata/messaging/core/Type.java | 27 ++ .../impl/RabbitMQProcessLaunchPublisher.java | 156 +++---- .../messaging/core/impl/RabbitMQProducer.java | 440 +++++++++---------- .../messaging/core/impl/RabbitMQPublisher.java | 118 +++++ .../core/impl/RabbitMQStatusPublisher.java | 212 ++++----- .../messaging/core/impl/RabbitMQSubscriber.java | 7 +- .../core/impl/GFACPassiveJobSubmitter.java | 9 +- .../server/OrchestratorServerHandler.java | 6 +- .../ExperimentExecution.java | 3 +- .../workflow/core/WorkflowEnactmentService.java | 7 +- .../workflow/core/WorkflowInterpreter.java | 8 +- 24 files changed, 856 insertions(+), 656 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b9b2480c/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ----------------------------------------------------------------------
