Merge remote-tracking branch 'thilina/master' into cwl-browse Contributed by Thilina Manamgoda
This closes #20 This updates taverna-cwl-activities-ui to Taverna 3 Workbench Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/fff9a79d Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/fff9a79d Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/fff9a79d Branch: refs/heads/cwl-browse Commit: fff9a79d75270a75930d084eb7a7a677039d6332 Parents: fa2ba9b 97b3d8f Author: Stian Soiland-Reyes <st...@apache.org> Authored: Sun Aug 21 13:58:27 2016 +0100 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Sun Aug 21 13:58:27 2016 +0100 ---------------------------------------------------------------------- .gitignore | 2 +- pom.xml | 2 + .../CWLFiles/customtool1.cwl | 67 ---- .../CWLFiles/customtoolrecord.cwl | 41 -- taverna-cwl-activity-ui/Readme.md | 19 + .../images/Cwl-activity-Ui.png | Bin 0 -> 18419 bytes taverna-cwl-activity-ui/pom.xml | 213 ++++------ .../cwl/ui/serviceprovider/CwlServiceDesc.java | 73 ++-- .../cwl/ui/serviceprovider/CwlServiceIcon.java | 35 +- .../ui/serviceprovider/CwlServiceProvider.java | 233 ++++++++--- .../CwlServiceProviderConfig.java | 41 -- .../taverna/cwl/ui/serviceprovider/Testing.java | 158 -------- .../ui/view/CwlActivityContextViewFactory.java | 33 +- .../taverna/cwl/ui/view/CwlContextualView.java | 158 +++----- .../main/resources/Icons/cwl-logo-header.png | Bin 0 -> 4344 bytes .../resources/META-INF/spring/context-osgi.xml | 43 ++ .../main/resources/META-INF/spring/context.xml | 38 ++ .../apache/taverna/cwl/ui/TestWorkBench.java | 27 -- .../serviceprovider/CwlServiceProviderTest.java | 70 ++++ taverna-cwl-activity/Readme.md | 20 +- taverna-cwl-activity/pom.xml | 62 ++- .../cwl/CwlActivityConfigurationBean.java | 41 -- .../apache/taverna/cwl/CwlActivityFactory.java | 107 +++++ .../apache/taverna/cwl/CwlDummyActivity.java | 44 ++ .../org/apache/taverna/cwl/CwlDumyActivity.java | 260 ------------ .../java/org/apache/taverna/cwl/PortDetail.java | 58 --- .../spring/cwl-activity-context-osgi.xml | 32 ++ .../META-INF/spring/cwl-activity-context.xml | 29 ++ .../src/main/resources/schema.json | 31 ++ .../taverna/cwl/CwlActivityFactoryTest.java | 123 ++++++ taverna-cwl-utilities/pom.xml | 21 +- .../apache/taverna/cwl/utilities/CWLUtil.java | 398 +++++++++++++++++++ .../cwl/utilities/CwlContextualUtil.java | 125 ++++++ .../taverna/cwl/utilities/CwlScripting.java | 46 +++ .../taverna/cwl/utilities/PortDetail.java | 17 + .../apache/taverna/cwl/utilities/Utility.java | 194 --------- .../taverna/cwl/utilities/CWLUtilTest.java | 129 ++++++ .../cwl/utilities/CWLUtilTestResource.java | 174 ++++++++ .../cwl/utilities/CwlContextualUtilTest.java | 62 +++ .../src/test/resources/customtool1.cwl | 67 ++++ .../src/test/resources/customtool2.cwl | 46 +++ .../src/test/resources/inputDetails1.json | 1 + .../src/test/resources/inputDetails2.json | 1 + 43 files changed, 2074 insertions(+), 1267 deletions(-) ----------------------------------------------------------------------
