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/07 22:47:33 UTC
[1/2] incubator-taverna-workbench git commit: NOTICE about some
Crystal icons
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 1f98c7366 -> 3397419ff
NOTICE about some Crystal icons
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/e9e807bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/e9e807bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/e9e807bd
Branch: refs/heads/master
Commit: e9e807bd11c36ebd247342ebdaf7cdccb859dd15
Parents: 1f98c73
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Wed Sep 7 22:42:39 2016 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Wed Sep 7 22:42:39 2016 +0100
----------------------------------------------------------------------
NOTICE | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e9e807bd/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 1b2736d..bbb6604 100644
--- a/NOTICE
+++ b/NOTICE
@@ -29,6 +29,18 @@ taverna-workbench-impl/src/main/java/org/apache/taverna/workbench/ui/impl/Logger
TODO: This file is not Apache License compatible and must be removed
---------------------------------------------------------
+taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/
+
+
+TODO: Some of these icons are from the
+icon sets Crystal and Crystal Clear by Everaldo Coelho,
+licensed under the LGPL license.
+See https://commons.wikimedia.org/wiki/Crystal_Clear
+and https://commons.wikimedia.org/wiki/Category:Crystal_icons
+
+FIXME: Remove incompatible icons (but keep those we made ourselves)
+
+---------------------------------------------------------
TODO: check license for
[2/2] incubator-taverna-workbench git commit: Apache license header
Posted by st...@apache.org.
Apache license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/3397419f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/3397419f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/3397419f
Branch: refs/heads/master
Commit: 3397419ff7c56ed2a80ea40441bc335e90adc897
Parents: e9e807b
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Wed Sep 7 22:43:32 2016 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Wed Sep 7 22:43:32 2016 +0100
----------------------------------------------------------------------
taverna-loop-ui/src/test/resources/log4j.properties | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/3397419f/taverna-loop-ui/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-loop-ui/src/test/resources/log4j.properties b/taverna-loop-ui/src/test/resources/log4j.properties
index 850ede3..fdfbc1d 100644
--- a/taverna-loop-ui/src/test/resources/log4j.properties
+++ b/taverna-loop-ui/src/test/resources/log4j.properties
@@ -1,3 +1,17 @@
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## <The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
log4j.rootLogger=WARN, CONSOLE
log4j.logger.net.sf.taverna.t2=INFO
#log4j.logger.net.sf.taverna.t2.ui=DEBUG
@@ -7,4 +21,4 @@ log4j.logger.net.sf.taverna.t2=INFO
# Default output to console
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n
\ No newline at end of file
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n