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:07 UTC
[1/4] incubator-taverna-language git commit: Alternative to
OpenDocument-v1.2-os-manifest-schema.xsd
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 4da380952 -> 225197036
Alternative to OpenDocument-v1.2-os-manifest-schema.xsd
as I made it by hand it can be licensed Apache License 2.0
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/8fb8e773
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/8fb8e773
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/8fb8e773
Branch: refs/heads/master
Commit: 8fb8e77346485508ba70d6e144092ba58631f887
Parents: 4da3809
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 15:43:50 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 15:43:50 2018 +0100
----------------------------------------------------------------------
.../OpenDocument-v1.2-os-manifest-schema.xsd | 201 ---------------
...OpenDocument-v1.2-os-manifest-schema.xsd.old | 201 +++++++++++++++
taverna-robundle/src/main/xsd/binding.xjb | 2 +-
taverna-robundle/src/main/xsd/manifest.xsd | 245 +++++++++++++++++++
4 files changed, 447 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/8fb8e773/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd b/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd
deleted file mode 100644
index 9e5e863..0000000
--- a/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd
+++ /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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/8fb8e773/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
new file mode 100644
index 0000000..9e5e863
--- /dev/null
+++ b/taverna-robundle/src/main/xsd/OpenDocument-v1.2-os-manifest-schema.xsd.old
@@ -0,0 +1,201 @@
+<?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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/8fb8e773/taverna-robundle/src/main/xsd/binding.xjb
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/binding.xjb b/taverna-robundle/src/main/xsd/binding.xjb
index c45075c..4344dc1 100644
--- a/taverna-robundle/src/main/xsd/binding.xjb
+++ b/taverna-robundle/src/main/xsd/binding.xjb
@@ -28,7 +28,7 @@
<jaxb:package name="org.apache.taverna.robundle.xml.dsig" />
</jaxb:schemaBindings>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="OpenDocument-v1.2-os-manifest-schema.xsd">
+ <jaxb:bindings schemaLocation="manifest.xsd">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.taverna.robundle.xml.odf.manifest" />
</jaxb:schemaBindings>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/8fb8e773/taverna-robundle/src/main/xsd/manifest.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/manifest.xsd b/taverna-robundle/src/main/xsd/manifest.xsd
new file mode 100644
index 0000000..d2697c4
--- /dev/null
+++ b/taverna-robundle/src/main/xsd/manifest.xsd
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<xsd:schema targetNamespace="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+ elementFormDefault="qualified" attributeFormDefault="qualified"
+ version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ jaxb:version="2.0"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd">
+ <xsd:annotation>
+ <xsd:documentation>
+ 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.
+
+
+ This schema was created manually from
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#__RefHeading__752825_826425813
+ as an Open Source alternative to the more restrictively licensed
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-manifest-schema.rng
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <!--See https://www.w3.org/TR/xmlenc-core1/ -->
+
+ <xsd:element name="manifest" type="manifest:Manifest"></xsd:element>
+
+
+
+ <xsd:complexType name="Manifest">
+ <xsd:annotation>
+ <xsd:documentation>http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_manifest</xsd:documentation></xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="file-entry" type="manifest:FileEntry" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="version" type="xsd:string" fixed="1.2" use="required">
+ <xsd:annotation>
+ <xsd:documentation>http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_version_element-manifest_manifest</xsd:documentation></xsd:annotation></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="FileEntry">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_file-entry
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="encryption-data"
+ type="manifest:EncryptionData" minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="full-path" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Path within the archive. "/" denotes the archive
+ itself.
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_full-path
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="media-type" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ IANA media type
+
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_media-type
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="preferred-view-mode" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_preferred-view-mode
+ Defined values: "edit" "presentation-slide-show"
+ "read-only" ..or a namespaced token value
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="size" type="xsd:nonNegativeInteger">
+ <xsd:annotation>
+ <xsd:documentation>
+ size in bytes
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_size
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="version" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ format version (depends on media-type)
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_version_element-manifest_file-entry
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="EncryptionData">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_encryption-data
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="algorithm" type="manifest:Algorithm">
+ <xsd:annotation>
+ <xsd:documentation>http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_algorithm</xsd:documentation></xsd:annotation></xsd:element>
+ <xsd:element name="key-derivation"
+ type="manifest:KeyDerivation">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_key-derivation
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="start-key-generation"
+ type="manifest:StartKeyGeneration">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_start-key-generation
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="checksum" type="xsd:base64Binary">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_checksum
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="checksum-type" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_checksum-type
+ Defined values: "SHA1/1K" "SHA1"
+ "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0#sha1-1k"
+ "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0#sha256-1k"
+ IRI as listed in xmlenc-core section 5.7 or
+ alternative as in section 5.1
+
+ Producers should use:
+ "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0#sha256-1k"
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="Algorithm" >
+ <!-- Same as in xenc:EncryptionMethodType, except attribute xenc:Algorithm -->
+ <xsd:sequence>
+ <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"></xsd:any>
+ </xsd:sequence>
+ <xsd:attribute name="algorithm-name" type="xsd:string" use="required"></xsd:attribute>
+
+ </xsd:complexType>
+
+ <xsd:complexType name="StartKeyGeneration">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_key-size
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="key-size" type="xsd:nonNegativeInteger"
+ default="20">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_key-size
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="start-key-generation-name" type="xsd:string" default="SHA1">
+ <xsd:annotation>
+ <xsd:documentation>http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_start-key-generation-name
+Defined values:
+"SHA1"
+IRI listed in xmlenc-core section 5.7
+IRI of alternative algorithm xmlenc-core section 5.1
+Producers should use "http://www.w3.org/2000/09/xmldsig#sha256"</xsd:documentation>
+ </xsd:annotation></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="KeyDerivation">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_key-derivation
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:attribute name="iteration-count"
+ type="xsd:nonNegativeInteger">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_iteration-count
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="key-derivation-name" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_key-derivation-name
+ Defined values: "PBKDF2"
+ "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0#pbkdf2"
+ IRI of an implementation-defined alternative
+ algorithm
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="key-size" type="xsd:nonNegativeInteger"
+ default="16">
+ <xsd:annotation>
+ <xsd:documentation>
+ http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_key-size
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="salt" type="xsd:base64Binary">
+ <xsd:annotation>
+ <xsd:documentation>http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_salt</xsd:documentation></xsd:annotation></xsd:attribute>
+ </xsd:complexType>
+</xsd:schema>
[2/4] incubator-taverna-language git commit: TAVERNA-925: OASIS
licensed OpenDocument-v1.2-os-manifest-schema.rng
Posted by st...@apache.org.
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>
[4/4] incubator-taverna-language git commit: TAVERNA-925: New schema
makes JAXBElement
Posted by st...@apache.org.
TAVERNA-925: New schema makes JAXBElement<Manifest>
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/22519703
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/22519703
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/22519703
Branch: refs/heads/master
Commit: 2251970368b6b5e6cddf625febf839b23c13aa86
Parents: fb05e13
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 16:34:08 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 16:34:08 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java | 2 +-
.../org/apache/taverna/robundle/manifest/odf/ODFManifest.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/22519703/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java
index 63874c2..770da6c 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java
@@ -80,7 +80,7 @@ public class ODFJaxb {
protected static synchronized JAXBContext getJaxbContext() throws JAXBException {
if (jaxbContext == null) {
jaxbContext = JAXBContext.newInstance(ObjectFactory.class,
- org.apache.taverna.robundle.xml.odf.container.ObjectFactory.class,
+ org.apache.taverna.robundle.xml.odf.container.ObjectFactory.class,
org.apache.taverna.robundle.xml.dsig.ObjectFactory.class,
org.apache.taverna.robundle.xml.xenc.ObjectFactory.class
);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/22519703/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java
index 2962681..dcd24d5 100644
--- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java
+++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java
@@ -37,6 +37,7 @@ import java.net.URISyntaxException;
import java.nio.file.Path;
import java.util.logging.Logger;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import org.apache.taverna.robundle.Bundle;
@@ -201,7 +202,8 @@ public class ODFManifest extends ODFJaxb {
Path manifestXml = manifestXmlPath(bundle);
Manifest odfManifest;
try (InputStream inStream = newInputStream(manifestXml)) {
- odfManifest = (Manifest) createUnMarshaller().unmarshal(inStream);
+ JAXBElement<Manifest> element = (JAXBElement<Manifest>) createUnMarshaller().unmarshal(inStream);
+ odfManifest = element.getValue();
} catch (JAXBException e) {
// logger.warning("Could not parse " + manifestXml);
throw new IOException("Could not parse " + manifestXml, e);
[3/4] incubator-taverna-language git commit: TAVERNA-925: Required
attributes
Posted by st...@apache.org.
TAVERNA-925: Required attributes
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/fb05e139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/fb05e139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/fb05e139
Branch: refs/heads/master
Commit: fb05e1396d54e21f99ce2b9c51d69c85e480bddc
Parents: 0666c60
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 15:53:08 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 15:53:08 2018 +0100
----------------------------------------------------------------------
taverna-robundle/src/main/xsd/manifest.xsd | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/fb05e139/taverna-robundle/src/main/xsd/manifest.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/manifest.xsd b/taverna-robundle/src/main/xsd/manifest.xsd
index d2697c4..6ceac59 100644
--- a/taverna-robundle/src/main/xsd/manifest.xsd
+++ b/taverna-robundle/src/main/xsd/manifest.xsd
@@ -84,7 +84,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="media-type" type="xsd:string">
+ <xsd:attribute name="media-type" type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation>
IANA media type
@@ -139,7 +139,7 @@
</xsd:annotation>
</xsd:element>
<xsd:element name="start-key-generation"
- type="manifest:StartKeyGeneration">
+ type="manifest:StartKeyGeneration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#element-manifest_start-key-generation
@@ -147,14 +147,14 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="checksum" type="xsd:base64Binary">
+ <xsd:attribute name="checksum" type="xsd:base64Binary" use="required">
<xsd:annotation>
<xsd:documentation>
http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_checksum
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="checksum-type" type="xsd:string">
+ <xsd:attribute name="checksum-type" type="xsd:string" use="required">
<xsd:annotation>
<xsd:documentation>
http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part3.html#attribute-manifest_checksum-type