Merge new-workfow-design
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1014cd98 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1014cd98 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1014cd98 Branch: refs/heads/master Commit: 1014cd9830ae8a4d5ac1df836d357e8964db79ce Parents: b27dc19 5e5630d Author: shamrath <[email protected]> Authored: Wed Mar 25 13:25:13 2015 -0400 Committer: shamrath <[email protected]> Committed: Wed Mar 25 13:25:13 2015 -0400 ---------------------------------------------------------------------- .../lib/airavata/messagingEvents_types.cpp | 88 +++- .../lib/airavata/messagingEvents_types.h | 47 +- .../Airavata/Model/Messaging/Event/Types.php | 94 ++++ .../client/samples/CreateLaunchExperiment.java | 2 +- .../client/samples/RegisterSampleData.java | 50 +- .../model/messaging/event/MessageType.java | 5 +- .../messaging/event/ProcessSubmitEvent.java | 492 +++++++++++++++++++ .../messagingEvents.thrift | 8 +- .../airavata/common/utils/ServerSettings.java | 20 + .../main/resources/airavata-server.properties | 6 +- .../main/resources/airavata-server.properties | 4 + modules/credential-store/pom.xml | 19 +- .../airavata/gfac/server/GfacServerHandler.java | 1 + .../core/monitor/AiravataTaskStatusUpdator.java | 13 + .../core/impl/RabbitMQProcessConsumer.java | 158 ++++++ .../core/impl/RabbitMQProcessPublisher.java | 84 ++++ .../core/impl/RabbitMQStatusConsumer.java | 10 +- .../core/impl/RabbitMQStatusPublisher.java | 20 +- .../messaging/core/stats/CountWriterTask.java | 1 - .../airavata-orchestrator-service/pom.xml | 16 +- .../server/OrchestratorServerHandler.java | 159 ++++-- .../orchestrator/util/DataModelUtils.java | 8 +- modules/simple-workflow/pom.xml | 70 +++ .../simple/workflow/engine/ProcessContext.java | 62 +++ .../engine/SimpleWorkflowInterpreter.java | 400 +++++++++++++++ .../engine/WorkflowEnactmentService.java | 183 +++++++ .../simple/workflow/engine/WorkflowFactory.java | 31 ++ .../workflow/engine/WorkflowFactoryImpl.java | 74 +++ .../simple/workflow/engine/WorkflowParser.java | 32 ++ .../workflow/engine/dag/edge/DirectedEdge.java | 52 ++ .../simple/workflow/engine/dag/edge/Edge.java | 43 ++ .../engine/dag/nodes/ApplicationNode.java | 41 ++ .../engine/dag/nodes/ApplicationNodeImpl.java | 116 +++++ .../workflow/engine/dag/nodes/NodeState.java | 44 ++ .../workflow/engine/dag/nodes/NodeType.java | 28 ++ .../engine/dag/nodes/WorkflowInputNode.java | 37 ++ .../engine/dag/nodes/WorkflowInputNodeImpl.java | 99 ++++ .../workflow/engine/dag/nodes/WorkflowNode.java | 38 ++ .../engine/dag/nodes/WorkflowOutputNode.java | 37 ++ .../dag/nodes/WorkflowOutputNodeImpl.java | 100 ++++ .../simple/workflow/engine/dag/port/InPort.java | 41 ++ .../workflow/engine/dag/port/InputPortIml.java | 91 ++++ .../workflow/engine/dag/port/OutPort.java | 39 ++ .../workflow/engine/dag/port/OutPortImpl.java | 83 ++++ .../simple/workflow/engine/dag/port/Port.java | 36 ++ .../engine/parser/AiravataWorkflowParser.java | 291 +++++++++++ .../workflow/engine/parser/PortContainer.java | 53 ++ .../simple/workflow/engine/WorkflowDAGTest.java | 46 ++ .../parser/AiravataWorkflowParserTest.java | 119 +++++ .../src/test/resources/ComplexMathWorkflow.awf | 465 ++++++++++++++++++ .../registry/JCRComponentRegistry.java | 7 +- .../airavata/xbaya/XBayaConfiguration.java | 2 +- .../ui/dialogs/registry/RegistryWindow.java | 26 +- .../dialogs/workflow/WorkflowImportWindow.java | 2 +- .../ui/experiment/LaunchApplicationWindow.java | 7 +- .../RegistryWorkflowPublisherWindow.java | 3 +- .../WorkflowInterpreterLaunchWindow.java | 58 ++- pom.xml | 1 + 58 files changed, 4018 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1014cd98/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --cc airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index e65acb4,812f6c4..1af3450 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@@ -160,9 -162,10 +160,9 @@@ public class CreateLaunchExperiment public static void createAndLaunchExp() throws TException { -// final String expId = createEchoExperimentForFSD(airavataClient); List<String> experimentIds = new ArrayList<String>(); try { - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 1; i++) { // final String expId = createExperimentForSSHHost(airavata); // final String expId = createEchoExperimentForFSD(airavataClient); // final String expId = createMPIExperimentForFSD(airavataClient); http://git-wip-us.apache.org/repos/asf/airavata/blob/1014cd98/airavata-api/thrift-interface-descriptions/messagingEvents.thrift ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1014cd98/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --cc modules/configuration/server/src/main/resources/airavata-server.properties index 61ee3c5,8442472..0b7a000 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@@ -223,10 -225,7 +227,8 @@@ task.launch.publisher=org.apache.airava rabbitmq.status.exchange.name=airavata_rabbitmq_exchange rabbitmq.task.launch.exchange.name=airavata_task_launch_rabbitmq_exchange - - +activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQPublisher +rabbitmq.exchange.name=airavata_rabbitmq_exchange ########################################################################### # Orchestrator module Configuration http://git-wip-us.apache.org/repos/asf/airavata/blob/1014cd98/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1014cd98/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1014cd98/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ----------------------------------------------------------------------
