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 2015/03/08 02:37:38 UTC

[1/5] incubator-taverna-language git commit: roevo creative commons derivative into NOTICE

Repository: incubator-taverna-language
Updated Branches:
  refs/heads/master 784004955 -> 761c0d6eb


roevo creative commons derivative into NOTICE


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/29336744
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/29336744
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/29336744

Branch: refs/heads/master
Commit: 29336744313bf17276b709dc6d4643a0911b9afd
Parents: 7840049
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Mar 8 01:12:50 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Mar 8 01:12:50 2015 +0000

----------------------------------------------------------------------
 .../src/main/resources/META-INF/NOTICE          | 35 ++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.vm       | 39 --------------------
 .../apache/taverna/scufl2/rdfxml/xsd/roevo.xsd  | 15 ++++++++
 .../apache/taverna/scufl2/rdfxml/xsd/xml.xsd    |  9 +++--
 4 files changed, 56 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29336744/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE b/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..3516032
--- /dev/null
+++ b/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,35 @@
+Apache Taverna Scufl 2 Schemas
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+------------------------------------------------------
+xml.xsd
+Extensible Markup Language (XML) 1.0 (Fifth Edition)
+W3C Recommendation 26 November 2008
+http://www.w3.org/2001/xml.xsd
+http://www.w3.org/TR/xml/
+
+Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang). This software or 
+document includes material copied from or derived from:
+
+W3C liability, trademark and document use rules apply.
+http://www.w3.org/Consortium/Legal/2015/doc-license
+
+------------------------------------------------------
+
+roevo.xsd derived from 
+Research Object Evolution Ontology (roevo)
+http://w3id.org/ro/roevo
+
+  (c) 2011-2014
+    Raul Palma, PSNC
+    Jun Zhao, University of Oxford
+    Khalid Belhajjame, University of Manchester
+    Stian Soiland-Reyes, University of Manchester
+    Oscar Corcho, UPM
+
+  Creative Commons Attribution 3.0 License 
+  http://creativecommons.org/licenses/by/3.0
+

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29336744/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE.vm b/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE.vm
deleted file mode 100644
index f8b48e6..0000000
--- a/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE.vm
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## 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.
-##
-
-#if ($projectName)$projectName#else${project.name}#end
-
-Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
-
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-# xml.xsd
-
-Copyright © 2008 W3C® (MIT, ERCIM, Keio, Beihang). This software or 
-document includes material copied from or derived from:
-
-- Extensible Markup Language (XML) 1.0 (Fifth Edition)
-  W3C Recommendation 26 November 2008
-  http://www.w3.org/2001/xml.xsd  
-  http://www.w3.org/TR/xml/
-
-

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29336744/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
index 2c3d15f..8bc4f05 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
@@ -14,6 +14,21 @@
    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.
+
+
+Derived from Research Object Evolution Ontology (roevo)
+http://w3id.org/ro/roevo
+
+  (c) 2011-2014
+    Raul Palma, PSNC
+    Jun Zhao, University of Oxford
+    Khalid Belhajjame, University of Manchester
+    Stian Soiland-Reyes, University of Manchester
+    Oscar Corcho, UPM
+
+  Creative Commons Attribution 3.0 License 
+  http://creativecommons.org/licenses/by/3.0
+
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
 	elementFormDefault="qualified" targetNamespace="http://purl.org/wf4ever/roevo#" 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29336744/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/xml.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/xml.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/xml.xsd
index f317513..dccafb6 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/xml.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/xml.xsd
@@ -1,13 +1,16 @@
 <?xml version='1.0'?>
 <!--
-    Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang). This software or 
-	document includes material copied from or derived from:
-
   Extensible Markup Language (XML) 1.0 (Fifth Edition)
   W3C Recommendation 26 November 2008
   http://www.w3.org/2001/xml.xsd
   http://www.w3.org/TR/xml/
 
+  Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang). This software or 
+	document includes material copied from or derived from:
+
+  W3C liability, trademark and document use rules apply.
+  http://www.w3.org/Consortium/Legal/2015/doc-license
+
 -->
 <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" 
   xmlns:xs="http://www.w3.org/2001/XMLSchema" 


[5/5] incubator-taverna-language git commit: aggregated NOTICE (so far)

Posted by st...@apache.org.
aggregated NOTICE (so far)


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/761c0d6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/761c0d6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/761c0d6e

Branch: refs/heads/master
Commit: 761c0d6eb3828d146494421705e5b48c86799920
Parents: 56d4145
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Mar 8 01:37:29 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Mar 8 01:37:29 2015 +0000

----------------------------------------------------------------------
 NOTICE | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/761c0d6e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..46a8107
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,185 @@
+Apache Taverna Language
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------
+
+
+ODFDOM
+Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
+
+---------------------------------------------------------
+
+PAV ontology http://purl.org/pav/
+© Copyright 2008-2014 Massachusetts General Hospital; Harvard Medical School;
+Balboa Systems; University of Manchester
+
+---------------------------------------------------------
+
+W3C PROVenance Interchange Ontology (PROV-O)
+http://www.w3.org/ns/prov-o.rdf
+http://www.w3.org/TR/2013/REC-prov-o-20130430/
+
+W3C PROV Access and Query Ontology (PROV-AQ)
+http://www.w3.org/ns/prov-aq.owl
+http://www.w3.org/TR/2013/NOTE-prov-aq-20130430/
+
+Copyright © 2011-2013 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
+W3C liability, trademark and document use rules apply.
+http://www.w3.org/Consortium/Legal/2015/doc-license
+
+---------------------------------------------------------
+
+XML Encryption Syntax and Processing
+W3C Recommendation 10 December 2002
+http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
+http://www.w3.org/TR/xmlenc-core/
+
+Copyright © 2002 World Wide Web Consortium, (Massachusetts
+Institute of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+---------------------------------------------------------
+
+Schema for XML Signatures
+http://www.w3.org/2000/09/xmldsig#
+$Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+
+
+---------------------------------------------------------
+
+Friend of a Friend (FOAF) RDF vocabulary
+http://xmlns.com/foaf/spec/20140114.rdf
+
+Copyright © 2000-2014 Dan Brickley and Libby Miller
+This work is licensed under a Creative Commons Attribution License.
+http://creativecommons.org/licenses/by/1.0/
+
+---------------------------------------------------------
+
+DCMI metadata terms     
+http://purl.org/wf4ever/dcterms_od
+Modified to reduce owl:imports
+
+Adapted from Dublin Core in OWL 2
+http://purl.org/NET/dc_owl2dl/terms_od
+Modified for OWL compliance
+
+Adapted from Dublin Core
+http://purl.org/dc/terms/
+
+
+DCMI Abstract model
+http://purl.org/wf4ever/dcam
+Modified URI of the owl:Ontology
+     
+Adapted from Dublin Core in OWL 2
+http://purl.org/NET/dc_owl2dl/dcam
+Modified for OWL compliance
+
+Adapted from Dublin Core
+http://purl.org/dc/dcam/
+
+Copyright © 2012-2015 University of Manchester
+Copyright © 2009-2014 Simon Reinhardt (http://simon-reinhardt.de/)
+Copyright © 1995-2012 DCMI, the Dublin Core Metadata Initiative (http://dublincore.org/)
+
+Licensed under a Creative Commons Attribution 3.0 Unported License (CC BY 3.0).
+http://creativecommons.org/licenses/by/3.0/
+
+---------------------------------------------------------
+
+Open Annotation Data Model
+http://www.w3.org/ns/oa
+
+Copyright © 2012-2013 the Contributors to the Open Annotation Core Data Model
+Specification, published by the Open Annotation Community Group under the W3C
+Community Contributor License Agreement (CLA). A human-readable summary is
+available.      
+
+http://www.w3.org/community/about/agreements/cla/
+
+---------------------------------------------------------
+
+Open Document Format for Office Applications (OpenDocument) Version 1.2
+OASIS Standard, 29 September 2011
+Manifest Relax-NG Schema
+Source: http://docs.oasis-open.org/office/v1.2/os/
+Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
+
+
+---------------------------------------------------------
+
+Wf4Ever Research Object Model 1.0 
+https://w3id.org/ro/
+
+wfdesc ontology
+https://w3id.org/ro/wfdesc
+
+wfprov ontology
+https://w3id.org/ro/wfprov
+
+roterms ontology
+http://purl.org/wf4ever/roterms
+
+wf4ever ontology
+https://w3id.org/ro/wf4ever
+
+(c) 2011-2014
+  Stian Soiland-Reyes, University of Manchester
+  Sean Bechhofer, University of Manchester
+  Khalid Belhajjame, University of Manchester
+  Graham Klyne, University of Oxford
+  Daniel Garijo, UPM
+  Oscar Corcho, UPM
+  Esteban García Cuesta, iSOCO
+  Raul Palma, PSNC
+
+Licensed under a Creative Commons Attribution 3.0 License.
+http://creativecommons.org/licenses/by/3.0/
+
+
+------------------------------------------------------
+
+xml.xsd
+Extensible Markup Language (XML) 1.0 (Fifth Edition)
+W3C Recommendation 26 November 2008
+http://www.w3.org/2001/xml.xsd
+http://www.w3.org/TR/xml/
+
+Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang). This software or 
+document includes material copied from or derived from:
+
+W3C liability, trademark and document use rules apply.
+http://www.w3.org/Consortium/Legal/2015/doc-license
+
+------------------------------------------------------
+
+roevo.xsd derived from 
+Research Object Evolution Ontology (roevo)
+http://w3id.org/ro/roevo
+
+  (c) 2011-2014
+    Raul Palma, PSNC
+    Jun Zhao, University of Oxford
+    Khalid Belhajjame, University of Manchester
+    Stian Soiland-Reyes, University of Manchester
+    Oscar Corcho, UPM
+
+  Creative Commons Attribution 3.0 License 
+  http://creativecommons.org/licenses/by/3.0
+


[4/5] incubator-taverna-language git commit: rat check config updated

Posted by st...@apache.org.
rat check config updated


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/56d4145f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/56d4145f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/56d4145f

Branch: refs/heads/master
Commit: 56d4145f6064d61b3701db2e7f9c3473a09fc175
Parents: 12d7fec
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Mar 8 01:32:50 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Mar 8 01:32:50 2015 +0000

----------------------------------------------------------------------
 pom.xml | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/56d4145f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9961461..67c4692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,27 +61,36 @@
 						<exclude>**/mimetype</exclude>
 						<!-- Effectively a binary format -->
 						<exclude>**/*.url</exclude>
-						<!-- The following schemas are W3C; automatic retrieval during build is 
-							blocked by their administrative processes, yet they are explicitly
-							standardised documents intended for wide use. Their licenses should
-							be standard W3C ones, but that's never stated explicitly by the W3C.
-							"Thanks!" -->
+						<!-- Cannot contain comments; content must match program output. -->
+						<exclude>/src/test/resources/org/apache/taverna/scufl2/api/io/HelloWorld.txt</exclude>
+						<exclude>/src/test/resources/as.txt</exclude>
+						<!-- Expanded data bundle. Generated. -->
+						<exclude>/src/test/resources/full-example/ebi-wfrun-2013-05-31/</exclude>
+
+            <!-- 
+                 Below exclusions are for 
+                 externally sourced/derived files 
+                 that must be acknowledged in 
+                 NOTICE (and/or */src/*/resources/META-INF/NOTICE)
+            -->
+
+            <!-- W3C license -->
 						<exclude>**/xml.xsd</exclude>
 						<exclude>**/xenc-schema.xsd</exclude>
 						<exclude>**/xmldsig-core-schema.xsd</exclude>
-						<!-- This refers to the FOAF spec, which is available online at
-							http://xmlns.com/foaf/spec/ and which uses the CC-BY-SA 1.0
-							license. The RDF downloadable from the site, of which this is a copy,
-							has no copyright statement at all in it. -->
+            <exclude>**/prov-o.rdf</exclude>
+            <exclude>**/prov-o.ttl</exclude>
+            <exclude>**/prov-aq.rdf</exclude>
+            <!-- W3C Community license -->
+            <!-- FOAF, Creative Commons Attribution 1.0 -->
+            <exclude>**/oa.rdf</exclude>
 						<exclude>**/foaf.rdf</exclude>
-						<!-- The following contain a mix of licenses. PROBLEM! -->
-						<exclude>/src/main/resources/ontologies/*.owl</exclude>
-						<exclude>/src/main/resources/ontologies/*.rdf</exclude>
-						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/roterms.ttl</exclude>
-						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/wf4ever.ttl</exclude>
-						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/wfdesc.ttl</exclude>
-						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/wfprov.ttl</exclude>
-						<exclude>/src/main/resources/org/w3/prov-o.ttl</exclude>
+            <!-- Research Object Model, Creative Commons Attribution 3.0 -->
+						<exclude>**/roterms.ttl</exclude>
+            <exclude>**/wf4ever.ttl</exclude>
+            <exclude>**/wfdesc.ttl</exclude>
+            <exclude>**/wfprov.ttl</exclude>
+
 						<!-- Various files used for testing and test support only. -->
 						<!-- THESE SUPPORT COMMENTS with # --><!--taverna-integration-test-->
 						<exclude>/src/test/resources/t172starterpacklist</exclude>
@@ -117,11 +126,6 @@
 						<exclude>/src/test/resources/rdf-in-example-annotation.t2flow</exclude>
 						<exclude>/src/test/resources/workflow10.xml</exclude>
 						<exclude>/src/test/resources/full-example/ebi_interproscan_newservices_900329.t2flow</exclude>
-						<!-- Cannot contain comments; content must match program output. -->
-						<exclude>/src/test/resources/org/apache/taverna/scufl2/api/io/HelloWorld.txt</exclude>
-						<exclude>/src/test/resources/as.txt</exclude>
-						<!-- Expanded data bundle. Generated. -->
-						<exclude>/src/test/resources/full-example/ebi-wfrun-2013-05-31/</exclude>
 					</excludes>
 				</configuration>
 			</plugin>


[3/5] incubator-taverna-language git commit: W3C and ODFDOM into NOTICE

Posted by st...@apache.org.
W3C and ODFDOM into NOTICE


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/12d7fec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/12d7fec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/12d7fec2

Branch: refs/heads/master
Commit: 12d7fec281d55703ecb23e39445d147549e580eb
Parents: db09fdd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Mar 8 01:25:15 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Mar 8 01:25:15 2015 +0000

----------------------------------------------------------------------
 taverna-scufl2-ucfpackage/LICENSE-odfdom.txt    | 201 -------------------
 .../src/main/resources/META-INF/NOTICE          |  42 ++++
 2 files changed, 42 insertions(+), 201 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/12d7fec2/taverna-scufl2-ucfpackage/LICENSE-odfdom.txt
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/LICENSE-odfdom.txt b/taverna-scufl2-ucfpackage/LICENSE-odfdom.txt
deleted file mode 100644
index 29f81d8..0000000
--- a/taverna-scufl2-ucfpackage/LICENSE-odfdom.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (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
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/12d7fec2/taverna-scufl2-ucfpackage/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/src/main/resources/META-INF/NOTICE b/taverna-scufl2-ucfpackage/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..1c7a09d
--- /dev/null
+++ b/taverna-scufl2-ucfpackage/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,42 @@
+Apache Taverna Scufl 2 UCF Package
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------
+
+XML Encryption Syntax and Processing
+W3C Recommendation 10 December 2002
+http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
+http://www.w3.org/TR/xmlenc-core/
+
+Copyright © 2002 World Wide Web Consortium, (Massachusetts
+Institute of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+---------------------------------------------------------
+
+Schema for XML Signatures
+http://www.w3.org/2000/09/xmldsig#
+$Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+
+
+---------------------------------------------------------
+
+ODFDOM
+Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
+
+---------------------------------------------------------


[2/5] incubator-taverna-language git commit: More W3C NOTICEs..

Posted by st...@apache.org.
More W3C NOTICEs..


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/db09fdd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/db09fdd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/db09fdd9

Branch: refs/heads/master
Commit: db09fdd905cecf9f69955b518ababc6c53dcedef
Parents: 2933674
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Mar 8 01:20:46 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Mar 8 01:20:46 2015 +0000

----------------------------------------------------------------------
 .../src/main/resources/META-INF/NOTICE          | 42 ++++++++++++++++++++
 taverna-robundle/src/main/xsd/combine.xsd       |  4 --
 taverna-robundle/src/main/xsd/xenc-schema.xsd   |  9 +++--
 3 files changed, 47 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/db09fdd9/taverna-robundle/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/resources/META-INF/NOTICE b/taverna-robundle/src/main/resources/META-INF/NOTICE
index aa7e88a..a464027 100644
--- a/taverna-robundle/src/main/resources/META-INF/NOTICE
+++ b/taverna-robundle/src/main/resources/META-INF/NOTICE
@@ -25,6 +25,39 @@ Copyright © 2011-2013 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
 W3C liability, trademark and document use rules apply.
 http://www.w3.org/Consortium/Legal/2015/doc-license
 
+---------------------------------------------------------
+
+XML Encryption Syntax and Processing
+W3C Recommendation 10 December 2002
+http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
+http://www.w3.org/TR/xmlenc-core/
+
+Copyright © 2002 World Wide Web Consortium, (Massachusetts
+Institute of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+---------------------------------------------------------
+
+Schema for XML Signatures
+http://www.w3.org/2000/09/xmldsig#
+$Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+
+
+---------------------------------------------------------
+
+
 
 ---------------------------------------------------------
 
@@ -80,3 +113,12 @@ available.
 http://www.w3.org/community/about/agreements/cla/
 
 ---------------------------------------------------------
+
+Open Document Format for Office Applications (OpenDocument) Version 1.2
+OASIS Standard, 29 September 2011
+Manifest Relax-NG Schema
+Source: http://docs.oasis-open.org/office/v1.2/os/
+Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
+
+
+---------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/db09fdd9/taverna-robundle/src/main/xsd/combine.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/combine.xsd b/taverna-robundle/src/main/xsd/combine.xsd
index a8d356b..93a8af7 100644
--- a/taverna-robundle/src/main/xsd/combine.xsd
+++ b/taverna-robundle/src/main/xsd/combine.xsd
@@ -27,10 +27,6 @@ http://co.mbine.org/specifications/combine_archive-Draft1.pdf
 
 Authors: 
   * [Stian Soiland-Reyes](http://orcid.org/0000-0001-9842-9718)
-
-Copyright 2014, University of Manchester
-
-MIT license (See LICENSE.md or http://opensource.org/licenses/MIT)
 </xsd:documentation></xsd:annotation>
     <xsd:element name="omexManifest">
     	<xsd:annotation>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/db09fdd9/taverna-robundle/src/main/xsd/xenc-schema.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/xenc-schema.xsd b/taverna-robundle/src/main/xsd/xenc-schema.xsd
index 01a5c71..d206a32 100644
--- a/taverna-robundle/src/main/xsd/xenc-schema.xsd
+++ b/taverna-robundle/src/main/xsd/xenc-schema.xsd
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+XML Encryption Syntax and Processing
+W3C Recommendation 10 December 2002
+http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
+http://www.w3.org/TR/xmlenc-core/
+
 Copyright © 2002 World Wide Web Consortium, (Massachusetts
 Institute of Technology, Institut National de Recherche en Informatique et en
 Automatique, Keio University). All Rights Reserved.
 http://www.w3.org/Consortium/Legal/
 
-XML Encryption Syntax and Processing
-W3C Recommendation 10 December 2002
-http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
-http://www.w3.org/TR/xmlenc-core/
      -->
 <schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
         xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'