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/05/11 18:03:08 UTC

[2/4] incubator-taverna-language git commit: TAVERNA-925: OASIS licensed OpenDocument-v1.2-os-manifest-schema.rng

TAVERNA-925:  OASIS licensed OpenDocument-v1.2-os-manifest-schema.rng


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/0666c60c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/0666c60c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/0666c60c

Branch: refs/heads/master
Commit: 0666c60ca5d87b61576bd35e99c85aefdaa68039
Parents: 8fb8e77
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 15:50:20 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 15:50:20 2018 +0100

----------------------------------------------------------------------
 LICENSE                                         |  36 ---
 .../src/main/resources/META-INF/LICENSE         |  36 ---
 .../OpenDocument-v1.2-os-manifest-schema.rng    | 224 -------------------
 ...OpenDocument-v1.2-os-manifest-schema.xsd.old | 201 -----------------
 4 files changed, 497 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0666c60c/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6e202da..1e7ec33 100644
--- a/LICENSE
+++ b/LICENSE
@@ -325,42 +325,6 @@ available.
 http://www.w3.org/community/about/agreements/cla/
 
 ---------------------------------------------------------
-./taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.rng
-./taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd
-
-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.
-
-	All capitalized terms in the following text have the meanings assigned to them
-	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE.
-
-
----------------------------------------------------------
 ./taverna-robundle/src/main/resources/ontologies/ro.owl
 ./taverna-scufl2-wfdesc/src/main/resources/org/purl/wf4ever/wfdesc/wfdesc.ttl
 ./taverna-scufl2-wfdesc/src/main/resources/org/purl/wf4ever/wfdesc/wfprov.ttl

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0666c60c/taverna-robundle/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/resources/META-INF/LICENSE b/taverna-robundle/src/main/resources/META-INF/LICENSE
index 64ff87b..b83e350 100644
--- a/taverna-robundle/src/main/resources/META-INF/LICENSE
+++ b/taverna-robundle/src/main/resources/META-INF/LICENSE
@@ -323,42 +323,6 @@ available.
 http://www.w3.org/community/about/agreements/cla/
 
 ---------------------------------------------------------
-./taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.rng
-./taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd
-
-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.
-
-	All capitalized terms in the following text have the meanings assigned to them
-	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE.
-
-
----------------------------------------------------------
 ./taverna-robundle/src/main/resources/ontologies/ro.owl
 
 Wf4Ever Research Object Model 1.0

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0666c60c/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.rng
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.rng b/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.rng
deleted file mode 100644
index af13a26..0000000
--- a/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.rng
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        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.
-
-	All capitalized terms in the following text have the meanings assigned to them
-   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-<grammar 
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
->
-<start>
-	<choice>
-		<ref name="manifest"/>
-	</choice>
-</start>
-<define name="manifest">
-	<element name="manifest:manifest">
-		<ref name="manifest-attlist"/>
-		<oneOrMore>
-			<ref name="file-entry"/>
-		</oneOrMore>
-	</element>
-</define>
-<define name="manifest-attlist">
-	<attribute name="manifest:version">
-		<value>1.2</value>
-	</attribute>
-</define>
-<define name="file-entry">
-	<element name="manifest:file-entry">
-		<ref name="file-entry-attlist"/>
-		<optional>
-			<ref name="encryption-data"/>
-		</optional>
-	</element>
-</define>
-<define name="file-entry-attlist">
-  <interleave>
-	<attribute name="manifest:full-path">
-		<ref name="string"/>
-	</attribute>
-	<optional>
-		<attribute name="manifest:size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-	<attribute name="manifest:media-type">
-		<ref name="string"/>
-	</attribute>
-	<optional>
-		<attribute name="manifest:preferred-view-mode">
-			<choice>
-				<value>edit</value>
-				<value>presentation-slide-show</value>
-				<value>read-only</value>
-				<ref name="namespacedToken"/> 
-			</choice> 
-		</attribute> 
-	</optional> 
-	<optional>
-		<attribute name="manifest:version">
-			<ref name="string"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-
-<define name="encryption-data">
-	<element name="manifest:encryption-data">
-		<ref name="encryption-data-attlist"/>
-		<ref name="algorithm"/>
-		<optional>
-			<ref name="start-key-generation"/>
-		</optional>
-		<ref name="key-derivation"/>
-	</element>
-</define>
-<define name="encryption-data-attlist">
-  <interleave>
-	<attribute name="manifest:checksum-type">
-		<choice>
-			<value>SHA1/1K</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:checksum">
-		<ref name="base64Binary"/>
-	</attribute>
-  </interleave>
-</define>
-<define name="algorithm">
-	<element name="manifest:algorithm">
-		<ref name="algorithm-attlist"/>
-		<ref name="anyElements"/>
-	</element>
-</define>
-<define name="algorithm-attlist">
-  <interleave>
-	<attribute name="manifest:algorithm-name">
-		<choice>
-			<value>Blowfish CFB</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:initialisation-vector">
-		<ref name="base64Binary"/>
-	</attribute>
-  </interleave>
-</define>
-<define name="anyAttListOrElements">
-	<zeroOrMore>
-		<attribute>
-			<anyName/>
-			<text/>
-		</attribute>
-	</zeroOrMore>
-	<ref name="anyElements"/>
-</define>
-<define name="anyElements">
-	<zeroOrMore>
-		<element>
-			<anyName/>
-			<mixed>
-				<ref name="anyAttListOrElements"/>
-			</mixed>
-		</element>
-	</zeroOrMore>
-</define>
-<define name="key-derivation">
-	<element name="manifest:key-derivation">
-		<ref name="key-derivation-attlist"/>
-		<empty/>
-	</element>
-</define>
-<define name="key-derivation-attlist">
-  <interleave>
-	<attribute name="manifest:key-derivation-name">
-		<choice>
-			<value>PBKDF2</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:salt">
-		<ref name="base64Binary"/>
-	</attribute>
-	<attribute name="manifest:iteration-count">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	<optional>
-		<attribute name="manifest:key-size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-<define name="start-key-generation">
-	<element name="manifest:start-key-generation">
-		<ref name="start-key-generation-attlist"/>
-		<empty/>
-	</element>
-</define>
-<define name="start-key-generation-attlist">
-  <interleave>
-	<attribute name="manifest:start-key-generation-name">
-		<choice>
-			<value>SHA1</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<optional>
-		<attribute name="manifest:key-size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-<define name="base64Binary">
-	<data type="base64Binary"/>
-</define>
-<define name="namespacedToken">
-	<data type="QName">
-		<param name="pattern">[^:]+:[^:]+</param>
-	</data>
-</define>
-<define name="nonNegativeInteger">
-	<data type="nonNegativeInteger"/>
-</define>
-<define name="string">
-	<data type="string"/>
-</define>
-<define name="anyURI">
-	<data type="anyURI"/>
-</define>
-</grammar>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/0666c60c/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd.old
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd.old b/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd.old
deleted file mode 100644
index 9e5e863..0000000
--- a/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd.old
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
-  
-  All capitalized terms in the following text have the meanings assigned to them
-  in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-  full Policy may be found at the OASIS website.
-  
-  This document and translations of it may be copied and furnished to others, and
-  derivative works that comment on or otherwise explain it or assist in its
-  implementation may be prepared, copied, published, and distributed, in whole or
-  in part, without restriction of any kind, provided that the above copyright
-  notice and this section are included on all such copies and derivative works.
-  However, this document itself may not be modified in any way, including by
-  removing the copyright notice or references to OASIS, except as needed for the
-  purpose of developing any document or deliverable produced by an OASIS
-  Technical Committee (in which case the rules applicable to copyrights, as set
-  forth in the OASIS IPR Policy, must be followed) or as required to translate it
-  into languages other than English.
-  
-  The limited permissions granted above are perpetual and will not be revoked by
-  OASIS or its successors or assigns.
-  
-  This document and the information contained herein is provided on an "AS IS"
-  basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-  LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-  INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-  FITNESS FOR A PARTICULAR PURPOSE. 
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-  <xs:element name="manifest">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="manifest:file-entry"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="manifest:manifest-attlist"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="manifest-attlist">
-    <xs:attribute name="version" use="required" form="qualified">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="1.2"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-  </xs:attributeGroup>
-  <xs:element name="file-entry">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="manifest:encryption-data"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="manifest:file-entry-attlist"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="file-entry-attlist">
-    <xs:attribute name="full-path" use="required" form="qualified" type="manifest:string"/>
-    <xs:attribute name="size" form="qualified" type="manifest:nonNegativeInteger"/>
-    <xs:attribute name="media-type" use="required" form="qualified" type="manifest:string"/>
-    <xs:attribute name="preferred-view-mode" form="qualified">
-      <xs:simpleType>
-        <xs:union memberTypes="manifest:namespacedToken">
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="edit"/>
-            </xs:restriction>
-          </xs:simpleType>
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="presentation-slide-show"/>
-            </xs:restriction>
-          </xs:simpleType>
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="read-only"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:union>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="version" form="qualified" type="manifest:string"/>
-  </xs:attributeGroup>
-  <xs:element name="encryption-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="manifest:algorithm"/>
-        <xs:element minOccurs="0" ref="manifest:start-key-generation"/>
-        <xs:element ref="manifest:key-derivation"/>
-      </xs:sequence>
-      <xs:attributeGroup ref="manifest:encryption-data-attlist"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="encryption-data-attlist">
-    <xs:attribute name="checksum-type" use="required" form="qualified">
-      <xs:simpleType>
-        <xs:union memberTypes="manifest:anyURI">
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="SHA1/1K"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:union>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="checksum" use="required" form="qualified" type="manifest:base64Binary"/>
-  </xs:attributeGroup>
-  <xs:element name="algorithm">
-    <xs:complexType>
-      <xs:group ref="manifest:anyElements"/>
-      <xs:attributeGroup ref="manifest:algorithm-attlist"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="algorithm-attlist">
-    <xs:attribute name="algorithm-name" use="required" form="qualified">
-      <xs:simpleType>
-        <xs:union memberTypes="manifest:anyURI">
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="Blowfish CFB"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:union>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="initialisation-vector" use="required" form="qualified" type="manifest:base64Binary"/>
-  </xs:attributeGroup>
-  <xs:group name="anyAttListOrElements">
-    <xs:sequence>
-      <xs:group ref="manifest:anyElements"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:attributeGroup name="anyAttListOrElements">
-    <xs:anyAttribute processContents="skip"/>
-  </xs:attributeGroup>
-  <xs:group name="anyElements">
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="key-derivation">
-    <xs:complexType>
-      <xs:attributeGroup ref="manifest:key-derivation-attlist"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="key-derivation-attlist">
-    <xs:attribute name="key-derivation-name" use="required" form="qualified">
-      <xs:simpleType>
-        <xs:union memberTypes="manifest:anyURI">
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="PBKDF2"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:union>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="salt" use="required" form="qualified" type="manifest:base64Binary"/>
-    <xs:attribute name="iteration-count" use="required" form="qualified" type="manifest:nonNegativeInteger"/>
-    <xs:attribute name="key-size" form="qualified" type="manifest:nonNegativeInteger"/>
-  </xs:attributeGroup>
-  <xs:element name="start-key-generation">
-    <xs:complexType>
-      <xs:attributeGroup ref="manifest:start-key-generation-attlist"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="start-key-generation-attlist">
-    <xs:attribute name="start-key-generation-name" use="required" form="qualified">
-      <xs:simpleType>
-        <xs:union memberTypes="manifest:anyURI">
-          <xs:simpleType>
-            <xs:restriction base="xs:token">
-              <xs:enumeration value="SHA1"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:union>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="key-size" form="qualified" type="manifest:nonNegativeInteger"/>
-  </xs:attributeGroup>
-  <xs:simpleType name="base64Binary">
-    <xs:restriction base="xs:base64Binary"/>
-  </xs:simpleType>
-  <xs:simpleType name="namespacedToken">
-    <xs:restriction base="xs:QName">
-      <xs:pattern value="[^:]+:[^:]+"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="nonNegativeInteger">
-    <xs:restriction base="xs:nonNegativeInteger"/>
-  </xs:simpleType>
-  <xs:simpleType name="string">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
-  <xs:simpleType name="anyURI">
-    <xs:restriction base="xs:anyURI"/>
-  </xs:simpleType>
-</xs:schema>