Calls SAMLBinding to get attributes from AA

[java-idp.git] / src / schemas / credentials.xsd

diff --git a/src/schemas/credentials.xsd b/src/schemas/credentials.xsd
index f7b1219..31352fd 100644 (file)
--- a/src/schemas/credentials.xsd
+++ b/src/schemas/credentials.xsd
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by Walter F Hoehn, Jr (Columbia University in the City of New York) -->
-<xs:schema targetNamespace="urn:mace:shibboleth:credentials:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:credentials="urn:mace:shibboleth:credentials:1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema targetNamespace="urn:mace:shibboleth:credentials:1.0" xmlns:credentials="urn:mace:shibboleth:credentials:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
        <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
        <xs:element name="Credentials">
                <xs:complexType>
                        <xs:choice maxOccurs="unbounded">
-                               <xs:element ref="ds:KeyInfo"/>
                                <xs:element name="KeyStoreResolver">
                                        <xs:annotation>
                                                <xs:documentation>Pulls credentials from a Java keystore.</xs:documentation>
@@ -33,21 +32,22 @@
                                                <xs:complexContent>
                                                        <xs:extension base="credentials:BaseCredentialFinder">
                                                                <xs:sequence>
-                                                                       <xs:element name="Certificate">
+                                                                       <xs:element name="Key">
                                                                                <xs:complexType>
                                                                                        <xs:sequence>
                                                                                                <xs:element name="Path" type="xs:string"/>
-                                                                                               <xs:element name="CAPath" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                                                                                        </xs:sequence>
-                                                                                       <xs:attribute name="format" type="xs:string" use="optional" default="PEM"/>
+                                                                                       <xs:attribute name="format" type="credentials:FormatType" use="optional" default="PEM"/>
+                                                                                       <xs:attribute name="password" type="xs:string" use="optional"/>
                                                                                </xs:complexType>
                                                                        </xs:element>
-                                                                       <xs:element name="Key">
+                                                                       <xs:element name="Certificate" minOccurs="0">
                                                                                <xs:complexType>
                                                                                        <xs:sequence>
                                                                                                <xs:element name="Path" type="xs:string"/>
+                                                                                               <xs:element name="CAPath" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                                                                                        </xs:sequence>
-                                                                                       <xs:attribute name="format" type="xs:string" use="optional" default="PEM"/>
+                                                                                       <xs:attribute name="format" type="credentials:FormatType" use="optional" default="PEM"/>
                                                                                        <xs:attribute name="password" type="xs:string" use="optional"/>
                                                                                </xs:complexType>
                                                                        </xs:element>
@@ -73,8 +73,16 @@
                                        </xs:complexType>
                                </xs:element>
                        </xs:choice>
+                       <xs:anyAttribute namespace="##any" processContents="lax"/>
                </xs:complexType>
        </xs:element>
+       <xs:simpleType name="FormatType">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="PEM"/>
+                       <xs:enumeration value="DER"/>
+                       <xs:enumeration value="PKCS12"/>
+               </xs:restriction>
+       </xs:simpleType>
        <xs:complexType name="BaseCredentialFinder">
                <xs:attribute name="Id" type="xs:string" use="required"/>
        </xs:complexType>