incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svanteschub...@apache.org
Subject svn commit: r1709988 [1/3] - in /incubator/odf/trunk/validator: ./ src/main/resources/schema/odf1.0/ test/
Date Thu, 22 Oct 2015 11:14:04 GMT
Author: svanteschubert
Date: Thu Oct 22 11:14:04 2015
New Revision: 1709988

URL: http://svn.apache.org/viewvc?rev=1709988&view=rev
Log:
#ODFTOOLKIT-406# Avoiding ODF 1.0 schema download problem on Apache build servers by embedding
it to the project

Added:
    incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/
    incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-manifest-schema-v1.0-os.rng
    incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-schema-v1.0-os.rng
    incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-strict-schema-v1.0-os.rng
Removed:
    incubator/odf/trunk/validator/test/
Modified:
    incubator/odf/trunk/validator/pom.xml

Modified: incubator/odf/trunk/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/pom.xml?rev=1709988&r1=1709987&r2=1709988&view=diff
==============================================================================
--- incubator/odf/trunk/validator/pom.xml (original)
+++ incubator/odf/trunk/validator/pom.xml Thu Oct 22 11:14:04 2015
@@ -151,6 +151,13 @@
 							<toDir>${project.build.directory}/classes/schema/odf1.1</toDir>
 						</configuration>
 					</execution>
+                    <!-- https://issues.apache.org/jira/browse/ODFTOOLKIT-406
+                    Disabled due to a security exception on Apache servers, when downloading
from that OASIS host
+                    Error handling resource: sun.security.validator.ValidatorException: 
+                        PKIX path building failed: 
+                            sun.security.provider.certpath.SunCertPathBuilderException: 
+                                unable to find valid certification path to requested target
+                                                        
 					<execution>
 						<id>download-odf-manifest-schema-v1.0</id>
 						<phase>validate</phase>
@@ -187,6 +194,7 @@
 							<toDir>${project.build.directory}/classes/schema/odf1.0</toDir>
 						</configuration>
 					</execution>
+                                        -->       
 					<execution>
 						<id>download-mathml-schema-v3.0</id>
 						<phase>validate</phase>

Added: incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-manifest-schema-v1.0-os.rng
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-manifest-schema-v1.0-os.rng?rev=1709988&view=auto
==============================================================================
--- incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-manifest-schema-v1.0-os.rng
(added)
+++ incubator/odf/trunk/validator/src/main/resources/schema/odf1.0/OpenDocument-manifest-schema-v1.0-os.rng
Thu Oct 22 11:14:04 2015
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.0
+    OASIS standard, 1 May 2005
+    Relax-NG Manifest Schema
+
+    $Id$
+
+    © 2002-2005 OASIS Open
+    © 1999-2005 Sun Microsystems, Inc.
+-->
+
+<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">
+<define name="manifest">
+    <element name="manifest:manifest">
+        <oneOrMore>
+            <ref name="file-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<start>
+    <choice>
+        <ref name="manifest"/>
+    </choice>
+</start>
+<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" combine="interleave">
+    <attribute name="manifest:full-path">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <optional>
+        <attribute name="manifest:size">
+            <data type="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:media-type">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="encryption-data">
+    <element name="manifest:encryption-data">
+        <ref name="encryption-data-attlist"/>
+        <ref name="algorithm"/>
+        <ref name="key-derivation"/>
+    </element>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+    <attribute name="manifest:checksum-type">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+    <attribute name="manifest:checksum">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="algorithm">
+    <element name="manifest:algorithm">
+        <ref name="algorithm-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+    <attribute name="manifest:algorithm-name">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+    <attribute name="manifest:initialisation-vector">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="key-derivation">
+    <element name="manifest:key-derivation">
+        <ref name="key-derivation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:key-derivation-name">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:salt">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:iteration-count">
+            <data type="nonNegativeInteger"/>
+        </attribute>
+</define>
+</grammar>



Mime
View raw message