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 2016/09/22 11:28:19 UTC
[1/6] incubator-taverna-common-activities git commit: updated the
license
Repository: incubator-taverna-common-activities
Updated Branches:
refs/heads/cwl-browse fff9a79d7 -> b4eb4ede9
updated the license
included cwl logo license https://github.com/common-workflow-language/logo/issues/2
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/84186ba9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/84186ba9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/84186ba9
Branch: refs/heads/cwl-browse
Commit: 84186ba9a53436e224fc6d02c7a98c98d1b95870
Parents: 97b3d8f
Author: M.G.T.R Manamgoda <ma...@gmail.com>
Authored: Sun Aug 21 19:16:18 2016 +0530
Committer: GitHub <no...@github.com>
Committed: Sun Aug 21 19:16:18 2016 +0530
----------------------------------------------------------------------
LICENSE | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/84186ba9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 0b73e97..35e822e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,3 +210,17 @@ http://www.w3.org/Consortium/Legal/copyright-software-19980720
is Public Domain, see https://github.com/douglascrockford/JSON-js/
and http://www.json.org/js.html
---------------------------------------------------------
+./taverna-cwl-activity-ui/src/main/resources/Icons/cwl-logo-header.png
+
+Adapted from
+https://github.com/common-workflow-language/logo/blob/master/CWL-Logo-Header.png
+
+Changes by Thilina Manamgoda
+shrunk and cropped
+
+The Common Workflow Language Logos are (C) Copyright 2016 the Common Workflow Language Project and are released under the terms of the GNU Lesser General Public License, version 3 or any later version, or, at your option, of the Creative Commons Attribution-ShareAlike 3.0 Unported License.
+
+https://www.gnu.org/licenses/lgpl-3.0.en.html
+https://creativecommons.org/licenses/by-sa/3.0/
+https://github.com/common-workflow-language/logo/blob/master/LICENSE.md
+---------------------------------------------------------
[5/6] incubator-taverna-common-activities git commit: wordwrap
Posted by st...@apache.org.
wordwrap
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/7798d41e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/7798d41e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/7798d41e
Branch: refs/heads/cwl-browse
Commit: 7798d41ee9f2e93ecbad4d0527e9b3026a77438f
Parents: a8c9665
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 22 12:27:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 22 12:27:39 2016 +0100
----------------------------------------------------------------------
LICENSE | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/7798d41e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 1de5231..b03c944 100644
--- a/LICENSE
+++ b/LICENSE
@@ -218,8 +218,11 @@ https://github.com/common-workflow-language/logo/blob/master/CWL-Logo-Header.png
Changes by Thilina Manamgoda
shrunk and cropped
-The Common Workflow Language Logos are (C) Copyright 2016 the Common Workflow Language Project and are released under the terms of the Creative Commons Attribution-ShareAlike 3.0 Unported License.
+The Common Workflow Language Logos are
+(C) Copyright 2016 the Common Workflow Language Project and are released under
+the terms of the Creative Commons Attribution-ShareAlike 3.0 Unported License.
https://creativecommons.org/licenses/by-sa/3.0/
-See upstream https://github.com/common-workflow-language/logo/ for dual licensing alternatives.
+See upstream https://github.com/common-workflow-language/logo/ for dual
+licensing alternatives.
---------------------------------------------------------
[4/6] incubator-taverna-common-activities git commit: Merge
remote-tracking branch 'thilina/cwl-licenses' into cwl-browse
Posted by st...@apache.org.
Merge remote-tracking branch 'thilina/cwl-licenses' into cwl-browse
Clarify license of CWL logo
This closes #21
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/a8c96650
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/a8c96650
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/a8c96650
Branch: refs/heads/cwl-browse
Commit: a8c9665009b9b0a8458e74e43b6eb957f428c35b
Parents: fff9a79 e058f42
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 22 12:26:48 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 22 12:26:48 2016 +0100
----------------------------------------------------------------------
LICENSE | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
[3/6] incubator-taverna-common-activities git commit: removed the
"GNU Lesser General Public License"
Posted by st...@apache.org.
removed the "GNU Lesser General Public License"
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/e058f429
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/e058f429
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/e058f429
Branch: refs/heads/cwl-browse
Commit: e058f429010168ce73bcfdec7f5bd8b8bc8f8196
Parents: 65f733f
Author: M.G.T.R Manamgoda <ma...@gmail.com>
Authored: Thu Sep 22 16:51:36 2016 +0530
Committer: GitHub <no...@github.com>
Committed: Thu Sep 22 16:51:36 2016 +0530
----------------------------------------------------------------------
LICENSE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/e058f429/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5116182..1de5231 100644
--- a/LICENSE
+++ b/LICENSE
@@ -218,7 +218,7 @@ https://github.com/common-workflow-language/logo/blob/master/CWL-Logo-Header.png
Changes by Thilina Manamgoda
shrunk and cropped
-The Common Workflow Language Logos are (C) Copyright 2016 the Common Workflow Language Project and are released under the terms of the GNU Lesser General Public License, version 3 or any later version, or, at your option, of the Creative Commons Attribution-ShareAlike 3.0 Unported License.
+The Common Workflow Language Logos are (C) Copyright 2016 the Common Workflow Language Project and are released under the terms of the Creative Commons Attribution-ShareAlike 3.0 Unported License.
https://creativecommons.org/licenses/by-sa/3.0/
See upstream https://github.com/common-workflow-language/logo/ for dual licensing alternatives.
[6/6] incubator-taverna-common-activities git commit: public
constructor
Posted by st...@apache.org.
public constructor
also avoid NPE
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/b4eb4ede
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/b4eb4ede
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/b4eb4ede
Branch: refs/heads/cwl-browse
Commit: b4eb4ede9e789c8ff185e8912607c962d359e0e4
Parents: 7798d41
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 22 12:28:05 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 22 12:28:05 2016 +0100
----------------------------------------------------------------------
.../taverna/cwl/ui/serviceprovider/CwlServiceProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/b4eb4ede/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
index a1e2561..77b89bd 100644
--- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
+++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceProvider.java
@@ -56,7 +56,7 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl
public static final String COMMONWL = "commonwl/";
private static Logger logger = Logger.getLogger(CwlServiceProvider.class);
- CwlServiceProvider() {
+ public CwlServiceProvider() {
// FIXME
super(getDefaultConfiguration());
}
@@ -136,7 +136,7 @@ public class CwlServiceProvider extends AbstractConfigurableServiceProvider impl
private List<Path> getPath() {
String userInput = getConfiguration().getJsonAsObjectNode().get("path").asText();
// If user haven't provided a PATH
- if (userInput.isEmpty()||userInput==null) {
+ if (userInput==null || userInput.isEmpty()) {
List<Path> defaultPaths = new ArrayList<>();
addPath(defaultPaths, DEFAULT_PATH_1, null);
addPath(defaultPaths, DEFAULT_PATH_2, null);
[2/6] incubator-taverna-common-activities git commit: removed the
LGPL license attribution
Posted by st...@apache.org.
removed the LGPL license attribution
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/65f733fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/65f733fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/65f733fa
Branch: refs/heads/cwl-browse
Commit: 65f733fac2f4f83be4dba12b524a6334ad32c3f7
Parents: 84186ba
Author: M.G.T.R Manamgoda <ma...@gmail.com>
Authored: Thu Sep 22 16:10:56 2016 +0530
Committer: GitHub <no...@github.com>
Committed: Thu Sep 22 16:10:56 2016 +0530
----------------------------------------------------------------------
LICENSE | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/65f733fa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 35e822e..5116182 100644
--- a/LICENSE
+++ b/LICENSE
@@ -220,7 +220,6 @@ shrunk and cropped
The Common Workflow Language Logos are (C) Copyright 2016 the Common Workflow Language Project and are released under the terms of the GNU Lesser General Public License, version 3 or any later version, or, at your option, of the Creative Commons Attribution-ShareAlike 3.0 Unported License.
-https://www.gnu.org/licenses/lgpl-3.0.en.html
https://creativecommons.org/licenses/by-sa/3.0/
-https://github.com/common-workflow-language/logo/blob/master/LICENSE.md
+See upstream https://github.com/common-workflow-language/logo/ for dual licensing alternatives.
---------------------------------------------------------