You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2019/05/14 15:31:57 UTC

svn commit: r1859237 - in /santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas: exc-c14n.xsd xenc-schema-11.xsd xenc-schema.xsd xml.xsd xmldsig-core-schema.xsd

Author: coheigea
Date: Tue May 14 15:31:57 2019
New Revision: 1859237

URL: http://svn.apache.org/viewvc?rev=1859237&view=rev
Log:
SANTUARIO-505 - Remove Doctypes from the streaming schemas

Modified:
    santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/exc-c14n.xsd
    santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema-11.xsd
    santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema.xsd
    santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xml.xsd
    santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd

Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/exc-c14n.xsd
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/exc-c14n.xsd?rev=1859237&r1=1859236&r2=1859237&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/exc-c14n.xsd (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/exc-c14n.xsd Tue May 14 15:31:57 2019
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
-  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
-  [
-  <!ATTLIST schema
-        xmlns:ec CDATA #FIXED 'http://www.w3.org/2001/10/xml-exc-c14n#'>
-      <!ENTITY ec 'http://www.w3.org/2001/10/xml-exc-c14n#'>
-      <!ENTITY % p ''>
-      <!ENTITY % s ''>
-     ]> 
 
 
 <!-- Schema for Exclusive Canonicalization

Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema-11.xsd
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema-11.xsd?rev=1859237&r1=1859236&r2=1859237&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema-11.xsd (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema-11.xsd Tue May 14 15:31:57 2019
@@ -14,18 +14,6 @@
 #
 -->
 
-<!DOCTYPE schema  PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
- "http://www.w3.org/2001/XMLSchema.dtd"
- [
-	<!ATTLIST schema
-     xmlns:xenc CDATA #FIXED 'http://www.w3.org/2001/04/xmlenc#'
-     xmlns:ds CDATA #FIXED 'http://www.w3.org/2000/09/xmldsig#'
-     xmlns:xenc11 CDATA #FIXED 'http://www.w3.org/2009/xmlenc11#'>
-	<!ENTITY xenc 'http://www.w3.org/2001/04/xmlenc#'>
-	<!ENTITY % p ''>
-	<!ENTITY % s ''>
-]>
-
 <schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
         xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'
         xmlns:xenc11='http://www.w3.org/2009/xmlenc11#'

Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema.xsd
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema.xsd?rev=1859237&r1=1859236&r2=1859237&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema.xsd (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xenc-schema.xsd Tue May 14 15:31:57 2019
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema  PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
- "http://www.w3.org/2001/XMLSchema.dtd"
- [
-   <!ATTLIST schema
-     xmlns:xenc CDATA #FIXED 'http://www.w3.org/2001/04/xmlenc#'
-     xmlns:xop CDATA #FIXED 'http://www.w3.org/2004/08/xop/include'
-     xmlns:ds CDATA #FIXED 'http://www.w3.org/2000/09/xmldsig#'>
-   <!ENTITY xenc 'http://www.w3.org/2001/04/xmlenc#'>
-   <!ENTITY % p ''>
-   <!ENTITY % s ''>
-  ]>
 
 <schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
         xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'

Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xml.xsd
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xml.xsd?rev=1859237&r1=1859236&r2=1859237&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xml.xsd (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xml.xsd Tue May 14 15:31:57 2019
@@ -1,5 +1,4 @@
 <?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
 <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
 
  <xs:annotation>

Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd?rev=1859237&r1=1859236&r2=1859237&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/resources/bindings/schemas/xmldsig-core-schema.xsd Tue May 14 15:31:57 2019
@@ -1,13 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
-  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
- [
-   <!ATTLIST schema 
-     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
-   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
-   <!ENTITY % p ''>
-   <!ENTITY % s ''>
-  ]>
 
 <!-- Schema for XML Signatures
     http://www.w3.org/2000/09/xmldsig#