Repository: incubator-taverna-language Updated Branches: refs/heads/master dc44bde85 -> bfd6ea4b5
TAVERNA-920 ODFJaxb superclass ucfpackage can import robundle 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/f9212c5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/f9212c5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/f9212c5d Branch: refs/heads/master Commit: f9212c5d72246b4fc6961d5fb4e96aed3627d465 Parents: dc44bde Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Feb 23 01:04:00 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Tue Feb 23 01:04:30 2016 +0000 ---------------------------------------------------------------------- LICENSE | 2 - .../taverna/robundle/manifest/odf/ODFJaxb.java | 120 ++++++++ .../robundle/manifest/odf/ODFManifest.java | 91 +----- .../src/main/resources/META-INF/LICENSE | 1 + taverna-robundle/src/main/xsd/container.xsd | 7 - taverna-scufl2-ucfpackage/pom.xml | 17 +- .../taverna/scufl2/ucfpackage/UCFPackage.java | 7 +- .../src/main/resources/META-INF/LICENSE | 237 -------------- .../src/main/xsd/container.xsd | 199 ------------ .../src/main/xsd/xenc-schema.xsd | 146 --------- .../src/main/xsd/xmldsig-core-schema.xsd | 308 ------------------- 11 files changed, 138 insertions(+), 997 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 8da18f2..ab45835 100644 --- a/LICENSE +++ b/LICENSE @@ -223,7 +223,6 @@ http://www.w3.org/Consortium/Legal/2015/doc-license --------------------------------------------------------- -./taverna-scufl2-ucfpackage/src/main/xsd/xenc-schema.xsd ./taverna-robundle/src/main/xsd/xenc-schema.xsd XML Encryption Syntax and Processing @@ -238,7 +237,6 @@ http://www.w3.org/Consortium/Legal/ --------------------------------------------------------- -./taverna-scufl2-ucfpackage/src/main/xsd/xmldsig-core-schema.xsd ./taverna-robundle/src/main/xsd/xmldsig-core-schema.xsd Schema for XML Signatures http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/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 new file mode 100644 index 0000000..d03e2a9 --- /dev/null +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java @@ -0,0 +1,120 @@ +package org.apache.taverna.robundle.manifest.odf; + +import static java.util.logging.Level.FINE; + +import java.util.logging.Logger; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; + +/* + * 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. + */ + +import com.sun.xml.bind.marshaller.NamespacePrefixMapper; + +import oasis.names.tc.opendocument.xmlns.manifest._1.ObjectFactory; + +/** + * JAXB bindings for ODF manifest.xml / container.xml + * + */ +public class ODFJaxb { + + private static Logger logger = Logger.getLogger(ODFJaxb.class.getCanonicalName()); + + protected final ObjectFactory manifestFactory = new ObjectFactory(); + + private static JAXBContext jaxbContext; + private static boolean warnedPrefixMapper; + + public static class ManifestNamespacePrefixMapperJAXB_RI extends NamespacePrefixMapper { + @Override + public String[] getPreDeclaredNamespaceUris() { + return super.getPreDeclaredNamespaceUris(); + } + + @Override + public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) { + switch (namespaceUri) { + case "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0": + return "manifest"; + case "urn:oasis:names:tc:opendocument:xmlns:container": + return ""; + case "http://www.w3.org/2000/09/xmldsig#": + return "ds"; + case "http://www.w3.org/2001/04/xmlenc#": + return "enc"; + } + return suggestion; + } + } + + protected static synchronized Marshaller createMarshaller() throws JAXBException { + Marshaller marshaller = getJaxbContext().createMarshaller(); + setPrefixMapper(marshaller); + return marshaller; + } + + protected static synchronized Unmarshaller createUnMarshaller() throws JAXBException { + return getJaxbContext().createUnmarshaller(); + } + + protected static synchronized JAXBContext getJaxbContext() throws JAXBException { + if (jaxbContext == null) { + jaxbContext = JAXBContext.newInstance(ObjectFactory.class + // , + // org.oasis_open.names.tc.opendocument.xmlns.container.ObjectFactory.class, + // org.w3._2000._09.xmldsig_.ObjectFactory.class, + // org.w3._2001._04.xmlenc_.ObjectFactory.class + ); + } + return jaxbContext; + } + + protected static void setPrefixMapper(Marshaller marshaller) { + boolean setPrefixMapper = false; + + try { + /* + * This only works with JAXB RI, in which case we can set the + * namespace prefix mapper + */ + Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper"); + marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", + new ManifestNamespacePrefixMapperJAXB_RI()); + /* + * Note: A similar mapper for the built-in java + * (com.sun.xml.bind.internal.namespacePrefixMapper) is no longer + * included here, as it will not (easily) compile with Maven. + */ + setPrefixMapper = true; + } catch (Exception e) { + logger.log(FINE, "Can't find NamespacePrefixMapper", e); + } + + if (!setPrefixMapper && !warnedPrefixMapper) { + logger.info( + "Could not set prefix mapper (missing or incompatible JAXB) " + "- will use prefixes ns0, ns1, .."); + warnedPrefixMapper = true; + } + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/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 4f96679..c13ddec 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 @@ -26,7 +26,6 @@ import static java.nio.file.Files.isRegularFile; import static java.nio.file.Files.newInputStream; import static java.nio.file.Files.newOutputStream; import static java.nio.file.Files.size; -import static java.util.logging.Level.FINE; import static java.util.logging.Level.WARNING; import java.io.IOException; @@ -38,109 +37,33 @@ import java.net.URISyntaxException; import java.nio.file.Path; import java.util.logging.Logger; -import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - -import oasis.names.tc.opendocument.xmlns.manifest._1.FileEntry; -import oasis.names.tc.opendocument.xmlns.manifest._1.Manifest; -import oasis.names.tc.opendocument.xmlns.manifest._1.ObjectFactory; import org.apache.taverna.robundle.Bundle; import org.apache.taverna.robundle.manifest.PathMetadata; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import oasis.names.tc.opendocument.xmlns.manifest._1.FileEntry; +import oasis.names.tc.opendocument.xmlns.manifest._1.Manifest; -public class ODFManifest { - public static class ManifestNamespacePrefixMapperJAXB_RI extends - NamespacePrefixMapper { - @Override - public String[] getPreDeclaredNamespaceUris() { - // TODO Auto-generated method stub - return super.getPreDeclaredNamespaceUris(); - } +public class ODFManifest extends ODFJaxb { - @Override - public String getPreferredPrefix(String namespaceUri, - String suggestion, boolean requirePrefix) { - if (namespaceUri - .equals("urn:oasis:names:tc:opendocument:xmlns:manifest:1.0")) - return "manifest"; - return suggestion; - } - } - - public static final String CONTAINER_XML = "META-INF/container.xml"; - private static JAXBContext jaxbContext; private static Logger logger = Logger.getLogger(ODFManifest.class .getCanonicalName()); - + + public static final String CONTAINER_XML = "META-INF/container.xml"; + public static final String MANIFEST_XML = "META-INF/manifest.xml"; private static final String ODF_MANIFEST_VERSION = "1.2"; - private static boolean warnedPrefixMapper; public static boolean containsManifest(Bundle bundle) { return isRegularFile(manifestXmlPath(bundle)); } - protected static synchronized Marshaller createMarshaller() - throws JAXBException { - Marshaller marshaller = getJaxbContext().createMarshaller(); - setPrefixMapper(marshaller); - return marshaller; - } - protected static synchronized Unmarshaller createUnMarshaller() - throws JAXBException { - return getJaxbContext().createUnmarshaller(); - } - - protected static synchronized JAXBContext getJaxbContext() - throws JAXBException { - if (jaxbContext == null) { - jaxbContext = JAXBContext.newInstance(ObjectFactory.class - // , - // org.oasis_open.names.tc.opendocument.xmlns.container.ObjectFactory.class, - // org.w3._2000._09.xmldsig_.ObjectFactory.class, - // org.w3._2001._04.xmlenc_.ObjectFactory.class - ); - } - return jaxbContext; - } - private static Path manifestXmlPath(Bundle bundle) { return bundle.getRoot().resolve(MANIFEST_XML); } - protected static void setPrefixMapper(Marshaller marshaller) { - boolean setPrefixMapper = false; - - try { - /* - * This only works with JAXB RI, in which case we can set the - * namespace prefix mapper - */ - Class.forName("com.sun.xml.bind.marshaller.NamespacePrefixMapper"); - marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", - new ManifestNamespacePrefixMapperJAXB_RI()); - /* - * Note: A similar mapper for the built-in java - * (com.sun.xml.bind.internal.namespacePrefixMapper) is no longer - * included here, as it will not (easily) compile with Maven. - */ - setPrefixMapper = true; - } catch (Exception e) { - logger.log(FINE, "Can't find NamespacePrefixMapper", e); - } - - if (!setPrefixMapper && !warnedPrefixMapper) { - logger.info("Could not set prefix mapper (missing or incompatible JAXB) " - + "- will use prefixes ns0, ns1, .."); - warnedPrefixMapper = true; - } - } - private Bundle bundle; // protected void prepareContainerXML() throws IOException { @@ -227,8 +150,6 @@ public class ODFManifest { private org.apache.taverna.robundle.manifest.Manifest manifest; - private ObjectFactory manifestFactory = new ObjectFactory(); - public ODFManifest(org.apache.taverna.robundle.manifest.Manifest manifest) { this.manifest = manifest; this.bundle = manifest.getBundle(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/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 1a35646..64ff87b 100644 --- a/taverna-robundle/src/main/resources/META-INF/LICENSE +++ b/taverna-robundle/src/main/resources/META-INF/LICENSE @@ -388,3 +388,4 @@ Copyright (c) 2011-2014 Licensed under a 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/f9212c5d/taverna-robundle/src/main/xsd/container.xsd ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/xsd/container.xsd b/taverna-robundle/src/main/xsd/container.xsd index c34a24d..d187a06 100644 --- a/taverna-robundle/src/main/xsd/container.xsd +++ b/taverna-robundle/src/main/xsd/container.xsd @@ -49,13 +49,6 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container"> ... </container> </xsd:documentation> - <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> - <jaxb:globalBindings /> - <jaxb:schemaBindings> - <jaxb:package name="org.oasis_open.names.tc.opendocument.xmlns.container" /> - </jaxb:schemaBindings> - </xsd:appinfo> </xsd:annotation> <!-- xmldsig-core-schema.xsd is also included by xenc-schema.xsd --> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/taverna-scufl2-ucfpackage/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/pom.xml b/taverna-scufl2-ucfpackage/pom.xml index 853d277..8c89b3a 100644 --- a/taverna-scufl2-ucfpackage/pom.xml +++ b/taverna-scufl2-ucfpackage/pom.xml @@ -53,6 +53,12 @@ <version>${jaxen.version}</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-robundle</artifactId> + <version>${project.parent.version}</version> + </dependency> </dependencies> <licenses> <license> @@ -68,17 +74,6 @@ <build> <plugins> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java b/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java index b806ffe..0d3af71 100644 --- a/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java +++ b/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java @@ -48,6 +48,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; +import org.apache.taverna.robundle.manifest.odf.ODFJaxb; import org.apache.taverna.scufl2.ucfpackage.impl.odfdom.pkg.OdfPackage; import org.apache.taverna.scufl2.ucfpackage.impl.odfdom.pkg.manifest.OdfFileEntry; import org.oasis_open.names.tc.opendocument.xmlns.container.Container; @@ -57,7 +58,7 @@ import org.oasis_open.names.tc.opendocument.xmlns.container.RootFile; import org.w3c.dom.Document; -public class UCFPackage implements Cloneable { +public class UCFPackage extends ODFJaxb implements Cloneable { private static Logger logger = Logger.getLogger(UCFPackage.class.getName()); private static final String CONTAINER_XML = "META-INF/container.xml"; private static final Charset UTF_8 = Charset.forName("utf-8"); @@ -250,7 +251,9 @@ public class UCFPackage implements Cloneable { protected static synchronized Marshaller createMarshaller() throws JAXBException { - return getJaxbContext().createMarshaller(); + Marshaller marshaller = getJaxbContext().createMarshaller(); + setPrefixMapper(marshaller); + return marshaller; } protected static synchronized Unmarshaller createUnMarshaller() http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/taverna-scufl2-ucfpackage/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/src/main/resources/META-INF/LICENSE b/taverna-scufl2-ucfpackage/src/main/resources/META-INF/LICENSE deleted file mode 100644 index e0b4639..0000000 --- a/taverna-scufl2-ucfpackage/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,237 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - ---------------------------------------------------------- -./taverna-scufl2-ucfpackage/src/main/xsd/xenc-schema.xsd - -XML Encryption Syntax and Processing -W3C Recommendation 10 December 2002 -http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd -http://www.w3.org/TR/xmlenc-core/ - -Copyright (c) 2002 World Wide Web Consortium, (Massachusetts -Institute of Technology, Institut National de Recherche en Informatique et en -Automatique, Keio University). All Rights Reserved. -http://www.w3.org/Consortium/Legal/ - - ---------------------------------------------------------- -./taverna-scufl2-ucfpackage/src/main/xsd/xmldsig-core-schema.xsd - -Schema for XML Signatures -http://www.w3.org/2000/09/xmldsig# -$Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $ - -Copyright 2001 The Internet Society and W3C (Massachusetts Institute -of Technology, Institut National de Recherche en Informatique et en -Automatique, Keio University). All Rights Reserved. -http://www.w3.org/Consortium/Legal/ - -This document is governed by the W3C Software License [1] as described -in the FAQ [2]. - -[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720 -[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/taverna-scufl2-ucfpackage/src/main/xsd/container.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/src/main/xsd/container.xsd b/taverna-scufl2-ucfpackage/src/main/xsd/container.xsd deleted file mode 100644 index 74f9f6f..0000000 --- a/taverna-scufl2-ucfpackage/src/main/xsd/container.xsd +++ /dev/null @@ -1,199 +0,0 @@ -<?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:container" - elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"; - xmlns:container="urn:oasis:names:tc:opendocument:xmlns:container" - xmlns:enc="http://www.w3.org/2001/04/xmlenc#"; xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"; - 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. - - Manually adapted by Stian Soiland-Reyes from Relax-NG schema for - Adobe UCF definition for META-INF/container.xml - retrieved from: - http://livedocs.adobe.com/navigator/9/Navigator_SDK9_HTMLHelp/wwhelp/wwhimpl/common/html/wwhelp.htm?context=Navigator_SDK9_HTMLHelp&file=Appx_Packaging.6.31.html - - See - http://livedocs.adobe.com/navigator/9/Navigator_SDK9_HTMLHelp/wwhelp/wwhimpl/common/html/wwhelp.htm?context=Navigator_SDK9_HTMLHelp&file=Appx_Packaging.6.31.html - - OTE: urn:oasis:names:tc:opendocument:xmlns:container is *not* an - official namespace by OASIS, but the Adobe UCF specification defines - that a conforming META-INF/container.xml *must* use the *default* - namespace, eg: - - <container - xmlns="urn:oasis:names:tc:opendocument:xmlns:container"> - ... - </container> </xsd:documentation> - <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> - <jaxb:globalBindings /> - <jaxb:schemaBindings> - <jaxb:package name="org.oasis_open.names.tc.opendocument.xmlns.container" /> - </jaxb:schemaBindings> - </xsd:appinfo> - </xsd:annotation> - - <!-- xmldsig-core-schema.xsd is also included by xenc-schema.xsd --> - <xsd:import namespace='http://www.w3.org/2000/09/xmldsig#' - schemaLocation='./xmldsig-core-schema.xsd' /> - <!--schemaLocation="http://www.w3.org/TR/2002/REC-xmlenc-core-20021210/xenc-schema.xsd"; --> - <xsd:import namespace="http://www.w3.org/2001/04/xmlenc#"; - schemaLocation="xenc-schema.xsd" /> - <!--schemaLocation='http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd' --> - - <xsd:element name="container" type="container:Container"></xsd:element> - - <xsd:complexType name="Container"> - - <xsd:sequence> - <xsd:choice minOccurs="0" maxOccurs="2"> - <xsd:element name="rootFiles"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:any namespace="##other" processContents="lax" /> - <xsd:element name="rootFile" type="container:RootFile" /> - </xsd:choice> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - </xsd:complexType> - </xsd:element> - <xsd:any namespace="##other" - processContents="lax" maxOccurs="unbounded" /> - </xsd:choice> - - <xsd:sequence minOccurs="0"> - <xsd:element name="relationships"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:any namespace="##other" processContents="lax" /> - <xsd:element name="relationship" type="container:Relationship" /> - </xsd:choice> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - </xsd:complexType> - </xsd:element> - <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" - processContents="lax"> - <xsd:annotation> - <xsd:appinfo> - <jaxb:property name="any5" /> - </xsd:appinfo> - </xsd:annotation> - - </xsd:any> - </xsd:sequence> - - - <xsd:sequence minOccurs="0"> - <xsd:element name="signatures"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <!-- Can't use ##other as dsig: is in other <xsd:any namespace="##other" - processContents="lax"> <xsd:annotation> <xsd:appinfo> <jaxb:property name="any6" - /> </xsd:appinfo> </xsd:annotation> </xsd:any> --> - <xsd:element ref="dsig:Signature" /> - </xsd:choice> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - </xsd:complexType> - </xsd:element> - <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" - processContents="lax"> - <xsd:annotation> - <xsd:appinfo> - <jaxb:property name="any7" /> - </xsd:appinfo> - </xsd:annotation> - </xsd:any> - </xsd:sequence> - - <xsd:sequence minOccurs="0"> - <xsd:element name="encryption"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element ref="enc:EncryptedData" /> - <xsd:element ref="enc:EncryptedKey" /> - <!-- Can't use ##other as enc: is in other <xsd:any namespace="##other" - processContents="lax"> <xsd:annotation> <xsd:appinfo> <jaxb:property name="any8" - /> </xsd:appinfo> </xsd:annotation> </xsd:any> --> - </xsd:choice> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - </xsd:complexType> - </xsd:element> - - <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" - processContents="lax"> - <xsd:annotation> - <xsd:appinfo> - <jaxb:property name="any9" /> - </xsd:appinfo> - </xsd:annotation> - </xsd:any> - </xsd:sequence> - - </xsd:sequence> - - <xsd:attribute name="version" type="xsd:string" fixed="1.0"></xsd:attribute> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - - </xsd:complexType> - - <xsd:complexType name="RootFile"> - <xsd:sequence> - <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" - processContents="lax" /> - </xsd:sequence> - <xsd:attribute name="full-path" type="xsd:string" use="required"> - </xsd:attribute> - <xsd:attribute name="media-type" type="xsd:string" use="required"> - </xsd:attribute> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - - </xsd:complexType> - - <xsd:complexType name="Relationship"> - <xsd:sequence> - <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" - processContents="lax" /> - </xsd:sequence> - <xsd:attribute name="type" type="xsd:string"></xsd:attribute> - <xsd:attribute name="target" type="xsd:string"></xsd:attribute> - <xsd:anyAttribute namespace="##other" - processContents="lax" /> - </xsd:complexType> -</xsd:schema> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/taverna-scufl2-ucfpackage/src/main/xsd/xenc-schema.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/src/main/xsd/xenc-schema.xsd b/taverna-scufl2-ucfpackage/src/main/xsd/xenc-schema.xsd deleted file mode 100644 index 01a5c71..0000000 --- a/taverna-scufl2-ucfpackage/src/main/xsd/xenc-schema.xsd +++ /dev/null @@ -1,146 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -Copyright © 2002 World Wide Web Consortium, (Massachusetts -Institute of Technology, Institut National de Recherche en Informatique et en -Automatique, Keio University). All Rights Reserved. -http://www.w3.org/Consortium/Legal/ - -XML Encryption Syntax and Processing -W3C Recommendation 10 December 2002 -http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd -http://www.w3.org/TR/xmlenc-core/ - --> -<schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0' - xmlns:xenc='http://www.w3.org/2001/04/xmlenc#' - xmlns:ds='http://www.w3.org/2000/09/xmldsig#' - targetNamespace='http://www.w3.org/2001/04/xmlenc#' - elementFormDefault='qualified'> - - <import namespace="http://www.w3.org/2000/09/xmldsig#"; - schemaLocation="xmldsig-core-schema.xsd"/> - - <complexType name='EncryptedType' abstract='true'> - <sequence> - <element name='EncryptionMethod' type='xenc:EncryptionMethodType' - minOccurs='0'/> - <element ref='ds:KeyInfo' minOccurs='0'/> - <element ref='xenc:CipherData'/> - <element ref='xenc:EncryptionProperties' minOccurs='0'/> - </sequence> - <attribute name='Id' type='ID' use='optional'/> - <attribute name='Type' type='anyURI' use='optional'/> - <attribute name='MimeType' type='string' use='optional'/> - <attribute name='Encoding' type='anyURI' use='optional'/> - </complexType> - - <complexType name='EncryptionMethodType' mixed='true'> - <sequence> - <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/> - <element name='OAEPparams' minOccurs='0' type='base64Binary'/> - <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/> - </sequence> - <attribute name='Algorithm' type='anyURI' use='required'/> - </complexType> - - <simpleType name='KeySizeType'> - <restriction base="integer"/> - </simpleType> - - <element name='CipherData' type='xenc:CipherDataType'/> - <complexType name='CipherDataType'> - <choice> - <element name='CipherValue' type='base64Binary'/> - <element ref='xenc:CipherReference'/> - </choice> - </complexType> - - <element name='CipherReference' type='xenc:CipherReferenceType'/> - <complexType name='CipherReferenceType'> - <choice> - <element name='Transforms' type='xenc:TransformsType' minOccurs='0'/> - </choice> - <attribute name='URI' type='anyURI' use='required'/> - </complexType> - - <complexType name='TransformsType'> - <sequence> - <element ref='ds:Transform' maxOccurs='unbounded'/> - </sequence> - </complexType> - - - <element name='EncryptedData' type='xenc:EncryptedDataType'/> - <complexType name='EncryptedDataType'> - <complexContent> - <extension base='xenc:EncryptedType'> - </extension> - </complexContent> - </complexType> - - <!-- Children of ds:KeyInfo --> - - <element name='EncryptedKey' type='xenc:EncryptedKeyType'/> - <complexType name='EncryptedKeyType'> - <complexContent> - <extension base='xenc:EncryptedType'> - <sequence> - <element ref='xenc:ReferenceList' minOccurs='0'/> - <element name='CarriedKeyName' type='string' minOccurs='0'/> - </sequence> - <attribute name='Recipient' type='string' - use='optional'/> - </extension> - </complexContent> - </complexType> - - <element name="AgreementMethod" type="xenc:AgreementMethodType"/> - <complexType name="AgreementMethodType" mixed="true"> - <sequence> - <element name="KA-Nonce" minOccurs="0" type="base64Binary"/> - <!-- <element ref="ds:DigestMethod" minOccurs="0"/> --> - <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> - <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType"/> - <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType"/> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - - <!-- End Children of ds:KeyInfo --> - - <element name='ReferenceList'> - <complexType> - <choice minOccurs='1' maxOccurs='unbounded'> - <element name='DataReference' type='xenc:ReferenceType'/> - <element name='KeyReference' type='xenc:ReferenceType'/> - </choice> - </complexType> - </element> - - <complexType name='ReferenceType'> - <sequence> - <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/> - </sequence> - <attribute name='URI' type='anyURI' use='required'/> - </complexType> - - - <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/> - <complexType name='EncryptionPropertiesType'> - <sequence> - <element ref='xenc:EncryptionProperty' maxOccurs='unbounded'/> - </sequence> - <attribute name='Id' type='ID' use='optional'/> - </complexType> - - <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/> - <complexType name='EncryptionPropertyType' mixed='true'> - <choice maxOccurs='unbounded'> - <any namespace='##other' processContents='lax'/> - </choice> - <attribute name='Target' type='anyURI' use='optional'/> - <attribute name='Id' type='ID' use='optional'/> - <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/> - </complexType> - -</schema> - http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f9212c5d/taverna-scufl2-ucfpackage/src/main/xsd/xmldsig-core-schema.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/src/main/xsd/xmldsig-core-schema.xsd b/taverna-scufl2-ucfpackage/src/main/xsd/xmldsig-core-schema.xsd deleted file mode 100644 index 8422fdf..0000000 --- a/taverna-scufl2-ucfpackage/src/main/xsd/xmldsig-core-schema.xsd +++ /dev/null @@ -1,308 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Schema for XML Signatures - http://www.w3.org/2000/09/xmldsig# - $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $ - - Copyright 2001 The Internet Society and W3C (Massachusetts Institute - of Technology, Institut National de Recherche en Informatique et en - Automatique, Keio University). All Rights Reserved. - http://www.w3.org/Consortium/Legal/ - - This document is governed by the W3C Software License [1] as described - in the FAQ [2]. - - [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720 - [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD ---> - - -<schema xmlns="http://www.w3.org/2001/XMLSchema"; - xmlns:ds="http://www.w3.org/2000/09/xmldsig#"; - targetNamespace="http://www.w3.org/2000/09/xmldsig#"; - version="0.1" elementFormDefault="qualified"> - -<!-- Basic Types Defined for Signatures --> - -<simpleType name="CryptoBinary"> - <restriction base="base64Binary"> - </restriction> -</simpleType> - -<!-- Start Signature --> - -<element name="Signature" type="ds:SignatureType"/> -<complexType name="SignatureType"> - <sequence> - <element ref="ds:SignedInfo"/> - <element ref="ds:SignatureValue"/> - <element ref="ds:KeyInfo" minOccurs="0"/> - <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="SignatureValue" type="ds:SignatureValueType"/> - <complexType name="SignatureValueType"> - <simpleContent> - <extension base="base64Binary"> - <attribute name="Id" type="ID" use="optional"/> - </extension> - </simpleContent> - </complexType> - -<!-- Start SignedInfo --> - -<element name="SignedInfo" type="ds:SignedInfoType"/> -<complexType name="SignedInfoType"> - <sequence> - <element ref="ds:CanonicalizationMethod"/> - <element ref="ds:SignatureMethod"/> - <element ref="ds:Reference" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> - <complexType name="CanonicalizationMethodType" mixed="true"> - <sequence> - <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/> - <!-- (0,unbounded) elements from (1,1) namespace --> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - - <element name="SignatureMethod" type="ds:SignatureMethodType"/> - <complexType name="SignatureMethodType" mixed="true"> - <sequence> - <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/> - <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> - <!-- (0,unbounded) elements from (1,1) external namespace --> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - -<!-- Start Reference --> - -<element name="Reference" type="ds:ReferenceType"/> -<complexType name="ReferenceType"> - <sequence> - <element ref="ds:Transforms" minOccurs="0"/> - <element ref="ds:DigestMethod"/> - <element ref="ds:DigestValue"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> - <attribute name="URI" type="anyURI" use="optional"/> - <attribute name="Type" type="anyURI" use="optional"/> -</complexType> - - <element name="Transforms" type="ds:TransformsType"/> - <complexType name="TransformsType"> - <sequence> - <element ref="ds:Transform" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <element name="Transform" type="ds:TransformType"/> - <complexType name="TransformType" mixed="true"> - <choice minOccurs="0" maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> - <!-- (1,1) elements from (0,unbounded) namespaces --> - <element name="XPath" type="string"/> - </choice> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - -<!-- End Reference --> - -<element name="DigestMethod" type="ds:DigestMethodType"/> -<complexType name="DigestMethodType" mixed="true"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> -</complexType> - -<element name="DigestValue" type="ds:DigestValueType"/> -<simpleType name="DigestValueType"> - <restriction base="base64Binary"/> -</simpleType> - -<!-- End SignedInfo --> - -<!-- Start KeyInfo --> - -<element name="KeyInfo" type="ds:KeyInfoType"/> -<complexType name="KeyInfoType" mixed="true"> - <choice maxOccurs="unbounded"> - <element ref="ds:KeyName"/> - <element ref="ds:KeyValue"/> - <element ref="ds:RetrievalMethod"/> - <element ref="ds:X509Data"/> - <element ref="ds:PGPData"/> - <element ref="ds:SPKIData"/> - <element ref="ds:MgmtData"/> - <any processContents="lax" namespace="##other"/> - <!-- (1,1) elements from (0,unbounded) namespaces --> - </choice> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="KeyName" type="string"/> - <element name="MgmtData" type="string"/> - - <element name="KeyValue" type="ds:KeyValueType"/> - <complexType name="KeyValueType" mixed="true"> - <choice> - <element ref="ds:DSAKeyValue"/> - <element ref="ds:RSAKeyValue"/> - <any namespace="##other" processContents="lax"/> - </choice> - </complexType> - - <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> - <complexType name="RetrievalMethodType"> - <sequence> - <element ref="ds:Transforms" minOccurs="0"/> - </sequence> - <attribute name="URI" type="anyURI"/> - <attribute name="Type" type="anyURI" use="optional"/> - </complexType> - -<!-- Start X509Data --> - -<element name="X509Data" type="ds:X509DataType"/> -<complexType name="X509DataType"> - <sequence maxOccurs="unbounded"> - <choice> - <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/> - <element name="X509SKI" type="base64Binary"/> - <element name="X509SubjectName" type="string"/> - <element name="X509Certificate" type="base64Binary"/> - <element name="X509CRL" type="base64Binary"/> - <any namespace="##other" processContents="lax"/> - </choice> - </sequence> -</complexType> - -<complexType name="X509IssuerSerialType"> - <sequence> - <element name="X509IssuerName" type="string"/> - <element name="X509SerialNumber" type="integer"/> - </sequence> -</complexType> - -<!-- End X509Data --> - -<!-- Begin PGPData --> - -<element name="PGPData" type="ds:PGPDataType"/> -<complexType name="PGPDataType"> - <choice> - <sequence> - <element name="PGPKeyID" type="base64Binary"/> - <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - <sequence> - <element name="PGPKeyPacket" type="base64Binary"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </choice> -</complexType> - -<!-- End PGPData --> - -<!-- Begin SPKIData --> - -<element name="SPKIData" type="ds:SPKIDataType"/> -<complexType name="SPKIDataType"> - <sequence maxOccurs="unbounded"> - <element name="SPKISexp" type="base64Binary"/> - <any namespace="##other" processContents="lax" minOccurs="0"/> - </sequence> -</complexType> - -<!-- End SPKIData --> - -<!-- End KeyInfo --> - -<!-- Start Object (Manifest, SignatureProperty) --> - -<element name="Object" type="ds:ObjectType"/> -<complexType name="ObjectType" mixed="true"> - <sequence minOccurs="0" maxOccurs="unbounded"> - <any namespace="##any" processContents="lax"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> - <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet --> - <attribute name="Encoding" type="anyURI" use="optional"/> -</complexType> - -<element name="Manifest" type="ds:ManifestType"/> -<complexType name="ManifestType"> - <sequence> - <element ref="ds:Reference" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - -<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> -<complexType name="SignaturePropertiesType"> - <sequence> - <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="SignatureProperty" type="ds:SignaturePropertyType"/> - <complexType name="SignaturePropertyType" mixed="true"> - <choice maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> - <!-- (1,1) elements from (1,unbounded) namespaces --> - </choice> - <attribute name="Target" type="anyURI" use="required"/> - <attribute name="Id" type="ID" use="optional"/> - </complexType> - -<!-- End Object (Manifest, SignatureProperty) --> - -<!-- Start Algorithm Parameters --> - -<simpleType name="HMACOutputLengthType"> - <restriction base="integer"/> -</simpleType> - -<!-- Start KeyValue Element-types --> - -<element name="DSAKeyValue" type="ds:DSAKeyValueType"/> -<complexType name="DSAKeyValueType"> - <sequence> - <sequence minOccurs="0"> - <element name="P" type="ds:CryptoBinary"/> - <element name="Q" type="ds:CryptoBinary"/> - </sequence> - <element name="G" type="ds:CryptoBinary" minOccurs="0"/> - <element name="Y" type="ds:CryptoBinary"/> - <element name="J" type="ds:CryptoBinary" minOccurs="0"/> - <sequence minOccurs="0"> - <element name="Seed" type="ds:CryptoBinary"/> - <element name="PgenCounter" type="ds:CryptoBinary"/> - </sequence> - </sequence> -</complexType> - -<element name="RSAKeyValue" type="ds:RSAKeyValueType"/> -<complexType name="RSAKeyValueType"> - <sequence> - <element name="Modulus" type="ds:CryptoBinary"/> - <element name="Exponent" type="ds:CryptoBinary"/> - </sequence> -</complexType> - -<!-- End KeyValue Element-types --> - -<!-- End Signature --> - -</schema>
