Added JDBC property element, and failover dependency.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@751 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/schemas/shibboleth-resolver-1.0.xsd b/src/schemas/shibboleth-resolver-1.0.xsd
index 6e18924..3e019dc 100644 (file)
--- a/src/schemas/shibboleth-resolver-1.0.xsd
+++ b/src/schemas/shibboleth-resolver-1.0.xsd
@@ -55,7 +55,12 @@
                                        <xs:complexType>
                                                <xs:complexContent>
                                                        <xs:extension base="resolver:BaseResolutionPlugIn">
-                                                               <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                                                               <xs:sequence>
+                                                                       <xs:element name="FailoverDependency" minOccurs="0">
+                                                                               <xs:complexType>
+                                                                                       <xs:attribute name="requires" type="xs:string" use="required"/>
+                                                                               </xs:complexType>
+                                                                       </xs:element>
                                                                        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
                                                                </xs:sequence>
                                                                <xs:attribute name="class" type="xs:string" use="required"/>
@@ -69,6 +74,11 @@
                                                <xs:complexContent>
                                                        <xs:extension base="resolver:BaseResolutionPlugIn">
                                                                <xs:sequence>
+                                                                       <xs:element name="FailoverDependency" minOccurs="0">
+                                                                               <xs:complexType>
+                                                                                       <xs:attribute name="requires" type="xs:string" use="required"/>
+                                                                               </xs:complexType>
+                                                                       </xs:element>
                                                                        <xs:element name="Search">
                                                                                <xs:complexType>
                                                                                        <xs:sequence minOccurs="0">
@@ -85,14 +95,12 @@
                                                                                        <xs:attribute name="filter" type="xs:string" use="required"/>
                                                                                </xs:complexType>
                                                                        </xs:element>
-                                                                       <xs:sequence>
-                                                                               <xs:element name="Property" maxOccurs="unbounded">
-                                                                                       <xs:complexType>
-                                                                                               <xs:attribute name="name" type="xs:string" use="required"/>
-                                                                                               <xs:attribute name="value" type="xs:string" use="required"/>
-                                                                                       </xs:complexType>
-                                                                               </xs:element>
-                                                                       </xs:sequence>
+                                                                       <xs:element name="Property" maxOccurs="unbounded">
+                                                                               <xs:complexType>
+                                                                                       <xs:attribute name="name" type="xs:string" use="required"/>
+                                                                                       <xs:attribute name="value" type="xs:string" use="required"/>
+                                                                               </xs:complexType>
+                                                                       </xs:element>
                                                                </xs:sequence>
                                                        </xs:extension>
                                                </xs:complexContent>
@@ -103,6 +111,11 @@
                                                <xs:complexContent>
                                                        <xs:extension base="resolver:BaseResolutionPlugIn">
                                                                <xs:sequence>
+                                                                       <xs:element name="FailoverDependency" minOccurs="0">
+                                                                               <xs:complexType>
+                                                                                       <xs:attribute name="requires" type="xs:string" use="required"/>
+                                                                               </xs:complexType>
+                                                                       </xs:element>
                                                                        <xs:element name="Query" type="xs:string"/>
                                                                        <xs:element name="AttributeExtractor" minOccurs="0">
                                                                                <xs:complexType>
@@ -118,6 +131,12 @@
                                                                                        <xs:anyAttribute namespace="##any" processContents="lax"/>
                                                                                </xs:complexType>
                                                                        </xs:element>
+                                                                       <xs:element name="Property" minOccurs="0" maxOccurs="unbounded">
+                                                                               <xs:complexType>
+                                                                                       <xs:attribute name="name" type="xs:string" use="required"/>
+                                                                                       <xs:attribute name="value" type="xs:string" use="required"/>
+                                                                               </xs:complexType>
+                                                                       </xs:element>
                                                                </xs:sequence>
                                                                <xs:attribute name="dbURL" type="xs:string" use="required"/>
                                                                <xs:attribute name="dbDriver" type="xs:string" use="optional"/>
@@ -146,7 +165,7 @@
                        </xs:element>
                        <xs:element name="AttributeDependency">
                                <xs:complexType>
-                                       <xs:attribute name="requires" type="xs:string" use="optional"/>
+                                       <xs:attribute name="requires" type="xs:string" use="required"/>
                                </xs:complexType>
                        </xs:element>
                </xs:choice>