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 <[email protected]> Authored: Sun Mar 8 01:12:50 2015 +0000 Committer: Stian Soiland-Reyes <[email protected]> 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";
