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 2018/12/07 03:42:14 UTC
[13/16] incubator-taverna-language git commit: Avoid roevo CC-BY
license
Avoid roevo CC-BY license
by removing documentation it is no longer by "derived from"
http://w3id.org/ro/roevo
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/0ba3ddfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/0ba3ddfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/0ba3ddfe
Branch: refs/heads/no-ontologies
Commit: 0ba3ddfe02dae441029ab1b6b12d998d09ec7002
Parents: 936293f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Dec 7 03:23:32 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Dec 7 03:24:41 2018 +0000
----------------------------------------------------------------------
.../src/main/resources/META-INF/NOTICE | 27 ------------------
.../apache/taverna/scufl2/rdfxml/xsd/roevo.xsd | 30 --------------------
.../apache/taverna/scufl2/rdfxml/xsd/xml.xsd | 6 ++--
3 files changed, 3 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0ba3ddfe/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
deleted file mode 100644
index 9ea3c3e..0000000
--- a/taverna-scufl2-schemas/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,27 +0,0 @@
-Apache Taverna Language SCUFL2 Schemas
-Copyright 2014-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-- Copyright 2010-2014 University of Manchester, UK
-These have been licensed to the Apache Software Foundation under a software grant.
-
------------------------------------------------------------------------------------
-./taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
-
-roevo.xsd derived from
-Research Object Evolution Ontology (roevo)
-http://w3id.org/ro/roevo
-
-Copyright (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/0ba3ddfe/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 f50c533..8bea766 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
@@ -15,23 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-
-This XML schema is derivative work from the Original Work,
-Research Object Evolution Ontology (roevo)
-http://w3id.org/ro/roevo
-used under the terms of
-Creative Commons Attribution 3.0 License
-http://creativecommons.org/licenses/by/3.0
-
-Attribution for the original work:
-
- (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
-
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
elementFormDefault="qualified" targetNamespace="http://purl.org/wf4ever/roevo#"
@@ -100,19 +83,6 @@ Attribution for the original work:
<xs:element ref="rdf:type" minOccurs="0"/>
<xs:element name="fromVersion" type="rdf:Resource" minOccurs="0" />
<xs:element name="hasChange" minOccurs="0" maxOccurs="3">
- <xs:annotation>
- <xs:documentation>
- <p xmlns='http://www.w3.org/1999/xhtml'>
- A ChangeSpecification can have up to 3 changes,
- one of Addition, one of Modificaton and one of Removal.
- Ironically, to avoid an 'non ambigious' XML Schema, this schema
- has to allow also say Addition, Addition, Removal. Clients MAY
- parse additional changes of the same type, but SHOULD merge them
- to a single change per type when saving, ie. add the resources
- from the second Addition to the resources of the first.
- </p>
- </xs:documentation>
- </xs:annotation>
<xs:complexType>
<xs:choice>
<xs:element name="Addition" type="roevo:Change" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0ba3ddfe/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 dccafb6..2dbcdb6 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,13 @@
<?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