Merge branch 'new-workflow-design'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/220e0419 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/220e0419 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/220e0419 Branch: refs/heads/master Commit: 220e041937dd35da5f440fc6c43c546ded01e923 Parents: 4031e50 509f203 Author: shamrath <[email protected]> Authored: Wed Mar 25 16:25:48 2015 -0400 Committer: shamrath <[email protected]> Committed: Wed Mar 25 16:25:48 2015 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 7 +- .../server/handler/AiravataServerHandler.java | 3 +- .../api/server/util/DataModelUtils.java | 3 +- .../main/resources/airavata-server.properties | 2 +- .../main/resources/airavata-server.properties | 2 +- .../airavata-orchestrator-service/pom.xml | 7 +- .../server/OrchestratorServerHandler.java | 2 +- .../orchestrator/util/DataModelUtils.java | 5 +- .../client/OrchestratorClientFactoryTest.java | 2 - 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 --------------- modules/workflow/pom.xml | 22 + modules/workflow/workflow-core/pom.xml | 74 +++ .../airavata/workflow/core/ProcessContext.java | 62 ++ .../core/SimpleWorkflowInterpreter.java | 400 +++++++++++++ .../workflow/core/WorkflowEnactmentService.java | 183 ++++++ .../airavata/workflow/core/WorkflowFactory.java | 31 + .../workflow/core/WorkflowFactoryImpl.java | 74 +++ .../airavata/workflow/core/WorkflowParser.java | 32 + .../workflow/core/dag/edge/DirectedEdge.java | 52 ++ .../airavata/workflow/core/dag/edge/Edge.java | 43 ++ .../core/dag/nodes/ApplicationNode.java | 41 ++ .../core/dag/nodes/ApplicationNodeImpl.java | 116 ++++ .../workflow/core/dag/nodes/NodeState.java | 44 ++ .../workflow/core/dag/nodes/NodeType.java | 28 + .../core/dag/nodes/WorkflowInputNode.java | 37 ++ .../core/dag/nodes/WorkflowInputNodeImpl.java | 99 ++++ .../workflow/core/dag/nodes/WorkflowNode.java | 38 ++ .../core/dag/nodes/WorkflowOutputNode.java | 37 ++ .../core/dag/nodes/WorkflowOutputNodeImpl.java | 100 ++++ .../airavata/workflow/core/dag/port/InPort.java | 41 ++ .../workflow/core/dag/port/InputPortIml.java | 91 +++ .../workflow/core/dag/port/OutPort.java | 39 ++ .../workflow/core/dag/port/OutPortImpl.java | 83 +++ .../airavata/workflow/core/dag/port/Port.java | 36 ++ .../core/parser/AiravataWorkflowParser.java | 291 +++++++++ .../workflow/core/parser/PortContainer.java | 53 ++ .../airavata/workflow/core/WorkflowDAGTest.java | 46 ++ .../core/parser/AiravataWorkflowParserTest.java | 119 ++++ .../src/test/resources/ComplexMathWorkflow.awf | 465 +++++++++++++++ .../test/resources/ParamChemApplicationTest.awf | 593 +++++++++++++++++++ pom.xml | 2 +- 68 files changed, 3384 insertions(+), 2772 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/220e0419/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/220e0419/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/220e0419/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ----------------------------------------------------------------------
