Sync up with C++ version
authorcantor <cantor@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 19 Mar 2004 06:15:44 +0000 (06:15 +0000)
committercantor <cantor@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 19 Mar 2004 06:15:44 +0000 (06:15 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@926 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/schemas/credentials.xsd

index 04a22d2..31352fd 100644 (file)
@@ -5,7 +5,6 @@
        <xs:element name="Credentials">
                <xs:complexType>
                        <xs:choice maxOccurs="unbounded">
        <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>
                                <xs:element name="KeyStoreResolver">
                                        <xs:annotation>
                                                <xs:documentation>Pulls credentials from a Java keystore.</xs:documentation>
@@ -49,6 +48,7 @@
                                                                                                <xs:element name="CAPath" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                                                                                        </xs:sequence>
                                                                                        <xs:attribute name="format" type="credentials:FormatType" use="optional" default="PEM"/>
                                                                                                <xs:element name="CAPath" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                                                                                        </xs:sequence>
                                                                                        <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:sequence>
                                                                                </xs:complexType>
                                                                        </xs:element>
                                                                </xs:sequence>
@@ -73,7 +73,6 @@
                                        </xs:complexType>
                                </xs:element>
                        </xs:choice>
                                        </xs:complexType>
                                </xs:element>
                        </xs:choice>
-                       <xs:attribute name="uri" type="xs:anyURI" use="optional"/>
                        <xs:anyAttribute namespace="##any" processContents="lax"/>
                </xs:complexType>
        </xs:element>
                        <xs:anyAttribute namespace="##any" processContents="lax"/>
                </xs:complexType>
        </xs:element>
@@ -81,6 +80,7 @@
                <xs:restriction base="xs:string">
                        <xs:enumeration value="PEM"/>
                        <xs:enumeration value="DER"/>
                <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:restriction>
        </xs:simpleType>
        <xs:complexType name="BaseCredentialFinder">