Pull the PAOS schema back out.

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index d6a6441..1e29d4d 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -43,8 +43,7 @@ schemafiles = \
        saml-schema-xacml-2.0.xsd \
        sstc-saml1x-metadata.xsd \
        sstc-saml-metadata-ext-query.xsd \
-       sstc-saml-protocol-ext-thirdparty.xsd \
-       liberty-paos-v1.1.xsd
+       sstc-saml-protocol-ext-thirdparty.xsd
 
 pkgxml_DATA = \
        saml20-catalog.xml \

diff --git a/schemas/liberty-paos-v1.1.xsd b/schemas/liberty-paos-v1.1.xsd
deleted file mode 100644 (file)
index 6070839..0000000
--- a/schemas/liberty-paos-v1.1.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="urn:liberty:paos:2003-08" 
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-    xmlns:S="http://schemas.xmlsoap.org/soap/envelope/" 
-    xmlns="urn:liberty:paos:2003-08" 
-    elementFormDefault="qualified" 
-    attributeFormDefault="unqualified">
-  <xs:annotation>
-    <xs:documentation>
-
-      The source code in this XSD file was excerpted verbatim from:
-
-      Liberty Reverse HTTP Binding
-      Version 1.1
-      14th December 2004
-
-      Copyright (c) 2003-2005 Liberty Alliance participants, see
-      http://www.projectliberty.org/specs/idwsf_1_1_copyrights.php
-
-        </xs:documentation>
-  </xs:annotation>
-  <xs:import namespace="http://schemas.xmlsoap.org/soap/envelope/" 
-    schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/>
-  <xs:include schemaLocation="liberty-utility-v1.1.xsd"/>
-  <xs:element name="Request" type="RequestType"/>
-  <xs:complexType name="RequestType">
-    <xs:attribute name="responseConsumerURL" type="xs:anyURI" use="required"/>
-    <xs:attribute name="service" type="xs:anyURI" use="required"/>
-    <xs:attribute name="messageID" type="IDType" use="optional"/>
-    <xs:attribute ref="S:mustUnderstand" use="required"/>
-    <xs:attribute ref="S:actor" use="required"/>
-  </xs:complexType>
-  <xs:element name="Response" type="ResponseType"/>
-  <xs:complexType name="ResponseType">
-    <xs:attribute name="refToMessageID" type="IDType" use="optional"/>
-    <xs:attribute ref="S:mustUnderstand" use="required"/>
-    <xs:attribute ref="S:actor" use="required"/>
-  </xs:complexType>
-</xs:schema>

diff --git a/schemas/saml20-catalog.xml.in b/schemas/saml20-catalog.xml.in
index 45a41e0..c3aef7d 100644 (file)
--- a/schemas/saml20-catalog.xml.in
+++ b/schemas/saml20-catalog.xml.in
@@ -11,5 +11,4 @@
        <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"/>
-       <system systemId="urn:liberty:paos:2003-08" uri="@-PKGXMLDIR-@/liberty-paos-v1.1.xsd"/>
 </catalog>