You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2018/08/06 14:46:18 UTC
[14/14] incubator-taverna-language git commit: Support nested
workflows by parsing processes recursively
Support nested workflows by parsing processes recursively
Merge commit 'refs/pull/39/head' of github.com:apache/incubator-taverna-language into cwlparser
Merges #39
Contributed by @haouech, ICLA on file.
Signed-off-by: Stian Soiland-Reyes <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/9cd4b878
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/9cd4b878
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/9cd4b878
Branch: refs/heads/cwlparser
Commit: 9cd4b87815d2a514a8a3b821cda4bef97b597cfb
Parents: afcfd77 b8081fa
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Aug 6 15:45:35 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Aug 6 15:45:35 2018 +0100
----------------------------------------------------------------------
.../apache/taverna/scufl2/cwl/CWLParser.java | 3 +-
.../apache/taverna/scufl2/cwl/CWLReader.java | 62 +++++++++
.../apache/taverna/scufl2/cwl/Converter.java | 90 ++++++++++--
.../org/apache/taverna/scufl2/cwl/Main.java | 58 --------
.../taverna/scufl2/cwl/WorkflowParser.java | 46 +++----
.../apache/taverna/scufl2/cwl/YAMLHelper.java | 12 +-
.../scufl2/cwl/components/CommandLineTool.java | 13 +-
.../scufl2/cwl/components/InputPort.java | 53 +++++++
.../taverna/scufl2/cwl/components/Main.java | 0
.../scufl2/cwl/components/OutputPort.java | 41 ++++++
.../taverna/scufl2/cwl/components/Process.java | 30 +++-
.../scufl2/cwl/components/Reference.java | 6 +-
.../taverna/scufl2/cwl/components/Step.java | 20 +--
.../scufl2/cwl/components/StepInput.java | 54 --------
.../scufl2/cwl/components/StepOutput.java | 41 ------
.../scufl2/cwl/components/WorkflowProcess.java | 137 +++++++++----------
...e.taverna.scufl2.api.io.WorkflowBundleReader | 1 +
.../main/resources/workflow_with_command.cwl | 45 ------
.../taverna/scufl2/cwl/TestConverting.java | 90 ++++++++++++
.../taverna/scufl2/cwl/TestWorkflowNesting.java | 95 +++++++++++++
.../taverna/scufl2/cwl/TestWorkflowProcess.java | 60 ++++++--
.../test/resources/workflow_with_command.cwl | 45 ++++++
.../test/resources/workflow_with_workflow.cwl | 48 +++++++
.../src/test/resources/worklflow2.cwl | 44 ------
24 files changed, 695 insertions(+), 399 deletions(-)
----------------------------------------------------------------------