Fix catalog usage to match "real life".

diff --git a/schemas/saml10-catalog.xml.in b/schemas/saml10-catalog.xml.in
index 24c8b71..f816639 100644 (file)
--- a/schemas/saml10-catalog.xml.in
+++ b/schemas/saml10-catalog.xml.in
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri name="urn:oasis:names:tc:SAML:1.0:assertion" uri="@-PKGXMLDIR-@/cs-sstc-schema-assertion-01.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:1.0:protocol" uri="@-PKGXMLDIR-@/cs-sstc-schema-protocol-01.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:1.0:assertion" uri="@-PKGXMLDIR-@/cs-sstc-schema-assertion-01.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:1.0:protocol" uri="@-PKGXMLDIR-@/cs-sstc-schema-protocol-01.xsd"/>
 </catalog>

diff --git a/schemas/saml11-catalog.xml.in b/schemas/saml11-catalog.xml.in
index 090084a..e552cfc 100644 (file)
--- a/schemas/saml11-catalog.xml.in
+++ b/schemas/saml11-catalog.xml.in
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri name="urn:oasis:names:tc:SAML:1.0:assertion" uri="@-PKGXMLDIR-@/cs-sstc-schema-assertion-1.1.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:1.0:protocol" uri="@-PKGXMLDIR-@/cs-sstc-schema-protocol-1.1.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:1.0:assertion" uri="@-PKGXMLDIR-@/cs-sstc-schema-assertion-1.1.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:1.0:protocol" uri="@-PKGXMLDIR-@/cs-sstc-schema-protocol-1.1.xsd"/>
 </catalog>

diff --git a/schemas/saml20-catalog.xml.in b/schemas/saml20-catalog.xml.in
index fa4fcf5..c3aef7d 100644 (file)
--- a/schemas/saml20-catalog.xml.in
+++ b/schemas/saml20-catalog.xml.in
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri name="urn:oasis:names:tc:SAML:2.0:assertion" uri="@-PKGXMLDIR-@/saml-schema-assertion-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:protocol" uri="@-PKGXMLDIR-@/saml-schema-protocol-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:metadata" uri="@-PKGXMLDIR-@/saml-schema-metadata-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:ac" uri="@-PKGXMLDIR-@/saml-schema-authn-context-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp" uri="@-PKGXMLDIR-@/saml-schema-ecp-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE" uri="@-PKGXMLDIR-@/saml-schema-dce-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500" uri="@-PKGXMLDIR-@/saml-schema-x500-2.0.xsd"/>
-    <uri name="urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML" uri="@-PKGXMLDIR-@/saml-schema-xacml-2.0.xsd"/>
-       <uri name="urn:oasis:names:tc:SAML:profiles:v1metadata" uri="@-PKGXMLDIR-@/sstc-saml1x-metadata.xsd"/>
-       <uri name="urn:oasis:names:tc:SAML:metadata:ext:query" uri="@-PKGXMLDIR-@/sstc-saml-metadata-ext-query.xsd"/>
-       <uri name="urn:oasis:names:tc:SAML:protocol:ext:third-party" uri="@-PKGXMLDIR-@/sstc-saml-protocol-ext-thirdparty.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:assertion" uri="@-PKGXMLDIR-@/saml-schema-assertion-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:protocol" uri="@-PKGXMLDIR-@/saml-schema-protocol-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:metadata" uri="@-PKGXMLDIR-@/saml-schema-metadata-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:ac" uri="@-PKGXMLDIR-@/saml-schema-authn-context-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp" uri="@-PKGXMLDIR-@/saml-schema-ecp-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE" uri="@-PKGXMLDIR-@/saml-schema-dce-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500" uri="@-PKGXMLDIR-@/saml-schema-x500-2.0.xsd"/>
+    <system systemId="urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML" uri="@-PKGXMLDIR-@/saml-schema-xacml-2.0.xsd"/>
+       <system systemId="urn:oasis:names:tc:SAML:profiles:v1metadata" uri="@-PKGXMLDIR-@/sstc-saml1x-metadata.xsd"/>
+       <system systemId="urn:oasis:names:tc:SAML:metadata:ext:query" uri="@-PKGXMLDIR-@/sstc-saml-metadata-ext-query.xsd"/>
+       <system systemId="urn:oasis:names:tc:SAML:protocol:ext:third-party" uri="@-PKGXMLDIR-@/sstc-saml-protocol-ext-thirdparty.xsd"/>
 </catalog>