Merge branch 'master' into cwl-browse
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/22a5fb1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/22a5fb1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/22a5fb1a Branch: refs/heads/cwl-browse Commit: 22a5fb1a62009f9203b68714a9ef354c979117fe Parents: 3a2d8dc 9d7ec5d Author: Stian Soiland-Reyes <[email protected]> Authored: Thu Jun 30 15:14:36 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Thu Jun 30 15:14:36 2016 +0100 ---------------------------------------------------------------------- LICENSE | 10 + NOTICE | 31 - README.md | 85 +- pom.xml | 21 +- taverna-beanshell-activity/pom.xml | 5 +- taverna-external-tool-activity/pom.xml | 7 +- .../externaltool/ExternalToolActivity.java | 12 +- .../ExternalToolActivityConfigurationBean.java | 8 +- .../externaltool/InvocationCreator.java | 6 +- .../externaltool/desc/ToolDescription.java | 897 +++++++++++++++++++ .../desc/ToolDescriptionParser.java | 111 +++ .../externaltool/desc/UseCaseDescription.java | 897 ------------------- .../externaltool/desc/UseCaseEnumeration.java | 111 --- .../externaltool/gui/AskUserForPwPopup.java | 74 -- .../externaltool/gui/PleaseWaitDialog.java | 73 -- .../externaltool/invocation/ToolInvocation.java | 321 +++++++ .../invocation/UseCaseInvocation.java | 321 ------- .../ExternalToolLocalInvocationMechanism.java | 2 +- .../local/LocalInvocationCreator.java | 12 +- .../local/LocalInvocationPersister.java | 6 +- .../local/LocalMechanismCreator.java | 2 +- .../externaltool/local/LocalToolInvocation.java | 560 ++++++++++++ .../local/LocalUseCaseInvocation.java | 560 ------------ .../ssh/ExternalToolSshInvocationMechanism.java | 2 +- .../externaltool/ssh/SshInvocationCreator.java | 12 +- .../ssh/SshInvocationPersister.java | 6 +- .../externaltool/ssh/SshMechanismCreator.java | 2 +- .../externaltool/ssh/SshToolInvocation.java | 560 ++++++++++++ .../externaltool/ssh/SshUseCaseInvocation.java | 560 ------------ ...pache.taverna.reference.ExternalReferenceSPI | 2 +- ...verna.reference.ValueToReferenceConverterSPI | 2 +- .../spring/external-tool-activity-context.xml | 4 +- .../externaltool/ssh/SshReference.hbm.xml | 2 +- taverna-interaction-activity/pom.xml | 9 +- taverna-rest-activity/pom.xml | 189 ++-- taverna-spreadsheet-import-activity/pom.xml | 5 +- taverna-wsdl-activity/pom.xml | 8 +- taverna-wsdl-generic/pom.xml | 10 +- .../src/main/resources/META-INF/LICENSE | 235 +++++ .../src/main/resources/META-INF/NOTICE | 42 - taverna-xpath-activity/pom.xml | 95 +- 41 files changed, 2971 insertions(+), 2906 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/22a5fb1a/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index fb9bef5,4a4545c..224d7cf --- a/pom.xml +++ b/pom.xml @@@ -52,7 -52,6 +52,8 @@@ <wss4j.version>1.6.18</wss4j.version> </properties> <modules> + <module>taverna-cwl-activity</module> ++ <module>taverna-cwl-activity-ui</module> <module>taverna-beanshell-activity</module> <module>taverna-external-tool-activity</module> <module>taverna-interaction-activity</module> @@@ -61,12 -60,7 +62,9 @@@ <module>taverna-wsdl-activity</module> <module>taverna-wsdl-generic</module> <module>taverna-xpath-activity</module> - <module>taverna-cwl-activity-ui</module> - - <module>taverna-cwl-utilities</module> </modules> + + <build> <plugins> <plugin>
