Merge branch 'queue-gfac-rabbitmq'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3eb91630 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3eb91630 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3eb91630 Branch: refs/heads/master Commit: 3eb91630f9846f22ad84baad97fa6e1521b77ab9 Parents: c05d5e6 5310bb4 Author: Lahiru Gunathilake <[email protected]> Authored: Mon Mar 23 15:14:15 2015 -0400 Committer: Lahiru Gunathilake <[email protected]> Committed: Mon Mar 23 15:14:15 2015 -0400 ---------------------------------------------------------------------- .../airavata/api/server/AiravataAPIServer.java | 5 +- .../server/handler/AiravataServerHandler.java | 2 +- .../lib/airavata/messagingEvents_types.cpp | 202 +++++- .../lib/airavata/messagingEvents_types.h | 106 ++- .../Airavata/Model/Messaging/Event/Types.php | 228 +++++++ .../client/samples/CreateLaunchExperiment.java | 435 ++++++------ .../model/messaging/event/MessageType.java | 8 +- .../model/messaging/event/TaskSubmitEvent.java | 684 +++++++++++++++++++ .../messaging/event/TaskTerminateEvent.java | 492 +++++++++++++ airavata-api/generate-thrift-files.sh | 22 +- .../messagingEvents.thrift | 16 +- .../airavata/common/utils/AiravataZKUtils.java | 27 + .../apache/airavata/common/utils/Constants.java | 1 + .../airavata/common/utils/ServerSettings.java | 24 +- .../main/resources/airavata-server.properties | 15 +- .../main/resources/airavata-server.properties | 10 +- modules/gfac/airavata-gfac-service/pom.xml | 10 + .../airavata/gfac/server/GfacServerHandler.java | 151 +++- modules/gfac/gfac-core/pom.xml | 1 + .../airavata/gfac/core/cpi/BetterGfacImpl.java | 8 +- .../core/monitor/GfacInternalStatusUpdator.java | 35 +- .../airavata/gfac/core/monitor/MonitorID.java | 3 +- .../airavata/gfac/core/utils/GFacUtils.java | 118 +++- .../gfac/local/provider/impl/LocalProvider.java | 4 +- .../handlers/GridPullMonitorHandler.java | 1 + .../airavata/gfac/monitor/util/CommonUtils.java | 2 +- .../messaging/client/RabbitMQListener.java | 4 +- .../airavata/messaging/core/MessageContext.java | 17 + .../messaging/core/MessagingConstants.java | 3 +- .../messaging/core/PublisherFactory.java | 23 +- .../airavata/messaging/core/TestClient.java | 5 +- .../messaging/core/impl/RabbitMQConsumer.java | 258 ------- .../messaging/core/impl/RabbitMQProducer.java | 27 +- .../messaging/core/impl/RabbitMQPublisher.java | 102 --- .../core/impl/RabbitMQStatusConsumer.java | 274 ++++++++ .../core/impl/RabbitMQStatusPublisher.java | 102 +++ .../core/impl/RabbitMQTaskLaunchConsumer.java | 253 +++++++ .../core/impl/RabbitMQTaskLaunchPublisher.java | 85 +++ .../server/OrchestratorServerHandler.java | 95 +-- .../util/OrchestratorRecoveryHandler.java | 3 +- modules/orchestrator/orchestrator-core/pom.xml | 4 +- .../core/context/OrchestratorContext.java | 11 + .../core/impl/GFACPassiveJobSubmitter.java | 220 ++++++ .../core/impl/GFACRPCJobSubmitter.java | 212 ++++++ .../core/impl/GFACServiceJobSubmitter.java | 212 ------ .../core/utils/OrchestratorConstants.java | 1 - .../workflow/engine/WorkflowEngineImpl.java | 4 +- .../airavata/xbaya/messaging/Monitor.java | 5 +- pom.xml | 7 + 49 files changed, 3610 insertions(+), 927 deletions(-) ----------------------------------------------------------------------
