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/15 14:00:28 UTC
[9/9] incubator-taverna-language git commit: Merge branch 'cwlparser'
Merge branch 'cwlparser'
Contributed by Majdi Haouech
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/af88d33f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/af88d33f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/af88d33f
Branch: refs/heads/master
Commit: af88d33fc0298232ec4965133465762e11888094
Parents: fb5c41a 991224b
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Aug 15 14:59:36 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Aug 15 15:00:05 2018 +0100
----------------------------------------------------------------------
.../apache/taverna/scufl2/cwl/CWLParser.java | 11 +--
.../apache/taverna/scufl2/cwl/CWLReader.java | 1 +
.../apache/taverna/scufl2/cwl/Converter.java | 52 ++++++++++++-
.../taverna/scufl2/cwl/TavernaConverter.java | 81 ++++++++++++++++++++
.../taverna/scufl2/cwl/WorkflowParser.java | 6 ++
.../apache/taverna/scufl2/cwl/YAMLHelper.java | 38 +++++++++
.../scufl2/cwl/components/CommandLineTool.java | 6 +-
.../scufl2/cwl/components/InputPort.java | 2 +-
.../scufl2/cwl/components/OutputPort.java | 2 +-
.../scufl2/cwl/components/PortDetail.java | 4 +-
.../taverna/scufl2/cwl/components/Process.java | 35 ++++++++-
.../scufl2/cwl/components/ProcessFactory.java | 2 +-
.../scufl2/cwl/components/Reference.java | 5 +-
.../taverna/scufl2/cwl/components/Step.java | 18 ++++-
.../scufl2/cwl/components/WorkflowProcess.java | 14 +++-
.../taverna/scufl2/cwl/TestConverting.java | 14 +++-
.../apache/taverna/scufl2/cwl/TestParser.java | 3 -
.../scufl2/cwl/TestTavernaConverter.java | 80 +++++++++++++++++++
.../taverna/scufl2/cwl/TestWorkflowNesting.java | 21 ++---
.../taverna/scufl2/cwl/TestWorkflowProcess.java | 5 ++
.../src/test/resources/hello_world.cwl | 2 +-
.../test/resources/workflow_with_workflow.cwl | 4 +-
22 files changed, 354 insertions(+), 52 deletions(-)
----------------------------------------------------------------------