You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@taverna.apache.org by ThilinaManamgoda <gi...@git.apache.org> on 2016/08/11 23:05:18 UTC
[GitHub] incubator-taverna-common-activities pull request #20: CWL
GitHub user ThilinaManamgoda opened a pull request:
https://github.com/apache/incubator-taverna-common-activities/pull/20
CWL
i have merged the taverna-3 branch to master branch
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ThilinaManamgoda/incubator-taverna-common-activities master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-taverna-common-activities/pull/20.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #20
----
commit 3ccc1a688c7df261f850a4b6546e426ff921a3c6
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-22T18:11:46Z
renamed Utility class to CWLUtil
commit f923083a94080713d0e2924ca3bd194899bc3a45
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-23T22:27:23Z
teting java 8 features
commit aa23487b5e85d24f003d15ae1ab2a03f9cce3ff8
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-24T00:11:05Z
add parallel capabilities to provider
commit 97abd447db584b650b00f2d9d8dcdde0b4bd5f90
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-24T00:19:19Z
result is cleared
commit 700228a6c37a75ab8c04a5fe0e4c784fb6930c14
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-24T18:57:28Z
modified result object
commit 1eeba1a9fa8d33b7e91229d067a6e7527ff9be31
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-26T20:04:32Z
trying port name
commit 3eaab2f2990e0d3d3946d7f9381c6ff68563c2f6
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-27T17:18:11Z
resource folder is added
commit a9c08c36a6e5009f5a7389619f0ae44880ff9f4f
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-27T17:47:08Z
add return statment
commit b60b0772d6b333dd5a18e1aec625d4218ef75773
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-27T17:49:22Z
pom is edited
commit aa016ca6825f9febd0d1b996ecf7d6eae4f42faf
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-30T20:58:30Z
tring to run workbench
commit 71d0aec02b94114a5b3b4f9707a57eb10ecbfa60
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-30T21:00:57Z
Merge remote-tracking branch 'apache/cwl-browse'
commit dc7e9936a2d7b33068296460a38f0417c1e8aca9
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-06-30T21:36:29Z
building
commit 80b439e8d75a3dea8ee677032feaf96383bd8935
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-03T10:49:05Z
dependency confilcts resolved .
pay attention to cwlDesc getActivity class
commit c815a148b180716b299f09d3f11ca57052cceef6
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-03T10:59:01Z
dependencies resovled
commit c191822b801d47c9f71a1535422b226ac90e0b44
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-04T18:06:17Z
CWLUtil test cases
commit 9a0c7a8c01b0207469fd6d544add4e6d848c038f
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-06T09:39:28Z
fixed : long line in description
commit 5cf3a3c73d888ac1b06e1e1381bea390c6ca2f75
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-06T09:42:35Z
add constants
commit 97e9870fe9aeb089c72df50c34f356d5510811f6
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-11T14:01:44Z
T3 way
commit de398c61da66d20338f7878a90783010730fe49d
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-12T01:04:48Z
remove snakeyaml dep from ui module
commit 7e6261462dd0cb94bd26650e17aaacb6994624a9
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-14T12:54:51Z
resolve T# dependecies
commit 0eaaab297f64b623bce6b9f1da391d64448e1e8d
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-14T12:59:19Z
removed Testing.java
commit de8ed1611215b123e49c688382a2b72d62b8181b
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-14T13:01:49Z
moved CWLFiles Folder
commit 81518de3c9bd3b365eab7840764888ecf2858d0d
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-16T12:16:07Z
1. add Icon resource folder to ui module
2. Service provider is configured using Configuration object
3. new CWL Activity Factory is added
4. Schema.json file is added which defines the structure of the CWL activity configuration
commit acf9f485ceaae75406a9f49e7b2a6a16cff9378b
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-16T18:29:48Z
Java Doc
commit c5e4ecc431cd53650b976af65c6bfc4868422c3e
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-16T18:36:23Z
Java Doc
commit 8d0537922732b04faa76679ef1e1f07f3091bbb9
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-16T20:59:48Z
Fixme setuped
commit 4e8f8d0938ce74d987bc1ed28aefde288ba658ac
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-16T21:24:53Z
javadocs
commit 626919d5bc0960ecc7940c1c031b0e5f18cd5637
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-23T08:12:55Z
unit tests
commit 0cb4858d409b667817d91efdd7d79470cd6a8ca5
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-27T00:04:51Z
activity problem
commit aa387b346b4287113ca21997490084b16b5b42df
Author: ThilinaManamgoda <ma...@gmail.com>
Date: 2016-07-27T21:53:47Z
moved CWLFiles content to src/test/resources
activity and activity-ui share common test reources
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities pull request #20: CWL
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-taverna-common-activities/pull/20
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by mr-c <gi...@git.apache.org>.
Github user mr-c commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
@stain Indeed; I've created a pull request to clarify the situation. https://github.com/common-workflow-language/common-workflow-language/pull/288
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
Thanks!
Some licensing things.. (sorry):
You add [cwl-logo-header.png](https://github.com/ThilinaManamgoda/incubator-taverna-common-activities/blob/master/taverna-cwl-activity-ui/src/main/resources/Icons/cwl-logo-header.png) - we talked about this coming from [commonwl.org repository](https://github.com/common-workflow-language/common-workflow-language/blob/master/site/CWL-Logo-Header.png) which is [now Apache licensed](https://github.com/common-workflow-language/common-workflow-language/blob/master/LICENSE.txt)
This simplifies things for us (compared to Creative Commons), but we still need to respect these elements of [Clause 4](https://www.apache.org/licenses/LICENSE-2.0.html#redistribution):
> (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
> (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
Clause a) is obvious as we are also Apache 2.0-licensed. As there is no `NOTICE` file in https://github.com/common-workflow-language/common-workflow-language we don't need to comply with clause d).
I think you have scaled and cropped the image, so we need to add the b) notice. Obviously this is a bit tricky in PNG - PNG metadata is not 'prominent', so perhaps adding a cwl-logo-header.txt would be easiest?
In `cwl-logo-header.txt` we can also for c) copy the attribution from the [CWL contributor list](https://github.com/common-workflow-language/common-workflow-language#individual-contributors) - we don't know which of these have contributed to the logo itself, but we can ask @tetron and @mr-c.
So @ThilinaManamgoda - would you be able to add such a text file to neighbour the PNG? Something like:
> cwl-logo-header.png adapted by Thilina Manamgoda, original from
> https://github.com/common-workflow-language/common-workflow-language/blob/master/site/CWL-Logo-Header.png
> which was contributed by
> Peter Amstutz,
> John Doe
> etc. (we can shrink the big list once we get info about who made the logo)
Also could you remove the [potatoman exampleIcon.png](https://github.com/ThilinaManamgoda/incubator-taverna-common-activities/blob/master/taverna-cwl-activity-ui/src/main/resources/exampleIcon.png) as we now believe we do not have permission to redistribute this :-(
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by mr-c <gi...@git.apache.org>.
Github user mr-c commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
The logo is under the following license: https://github.com/common-workflow-language/logo/blob/master/LICENSE.md
The logo was done as a work for hire by @stefanmalacu
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
@ThilinaManamgoda if the https://github.com/common-workflow-language/common-workflow-language/blob/master/site/CWL-Logo-Header.png logo is truly still under LGPL and CC-BY-SA-3.0 (which I think @mr-c would need to clarify), then we can't redistribute your shrunk PNG version, as it then [needs to be unmodified](http://apache.org/legal/resolved.html#cc-sa).
Of course you would be free to contribute the modified shrunk version back to https://github.com/common-workflow-language/logo and then we use that binary "unmodified". But still being under CC-BY-SA 3.0 it means you would need to modify this top-level `LICENSE` and `README`, e.g. as in https://github.com/apache/incubator-taverna-language/blob/master/LICENSE#L271
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
Thanks, @mr-c. Perhaps the simplest then is to drop the logo again.. unless @ThilinaManamgoda would like to have a go at adding those `LICENSE` and `README` modificatoins?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by galejwnaylor <gi...@git.apache.org>.
Github user galejwnaylor commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
In incubator-taverna-common-activities/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/ is it possible to rename CwlDumyActivity.java to CwlDummyActivity.java?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by ThilinaManamgoda <gi...@git.apache.org>.
Github user ThilinaManamgoda commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
I will try to add those license
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #20: CWL
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/20
Thanks, @mr-c! But does this not mean that https://github.com/common-workflow-language/common-workflow-language/blob/master/site/CWL-Logo-Header.png is a redistribution is a violation of both those licenses and also misleading as its [top-level repository LICENSE](https://github.com/common-workflow-language/common-workflow-language/blob/master/LICENSE.txt) claim it is Apache license?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---