New "finally" clause.

[metaproxy-moved-to-github.git] / etc / config.xsd

diff --git a/etc/config.xsd b/etc/config.xsd
index 2491c51..f35db43 100644 (file)
--- a/etc/config.xsd
+++ b/etc/config.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: config.xsd,v 1.5 2006-01-16 12:24:14 mike Exp $ -->
+<!-- $Id: config.xsd,v 1.12 2006-01-18 15:06:12 mike Exp $ -->
 <!--
        This Schema prescribes the format of YP2 configuration files.
        Invoke it like this:
@@ -17,7 +17,7 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="config:start"/>
-        <xs:element ref="config:filters"/>
+        <xs:element minOccurs="0" ref="config:filters"/>
         <xs:element ref="config:routes"/>
       </xs:sequence>
     </xs:complexType>
@@ -26,7 +26,7 @@
 
   <xs:element name="start">
     <xs:complexType>
-      <!-- ### We need to specify here that the element is empty -->
+      <!-- Absence of elements listed here mandates that <start> is empty -->
       <xs:attribute name="route" use="required" type="xs:NCName"/>
     </xs:complexType>
   </xs:element>
@@ -63,7 +63,16 @@
        <!-- type="virt_db" or type="multi" -->
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
 
-       <!-- type="auth_simple" or type="backend_test" -->
+       <!-- type="auth_simple" -->
+        <xs:sequence>
+         <xs:element minOccurs="0" ref="config:userRegister"/>
+         <xs:element minOccurs="0" ref="config:targetRegister"/>
+         <xs:element minOccurs="0" name="discardUnauthorisedTargets">
+           <xs:complexType/>
+         </xs:element>
+        </xs:sequence>
+
+       <!-- type="backend_test" -->
        <!-- No elements included -->
 
        <!-- type="session_shared" -->
@@ -97,6 +106,9 @@
   <xs:element name="port" type="xs:string"/>
   <xs:element name="timeout" type="xs:integer"/>
   <xs:element name="message" type="xs:NCName"/>
+  <xs:element name="userRegister" type="xs:string"/>
+  <xs:element name="targetRegister" type="xs:string"/>
+  <xs:element name="discardUnauthorisedTargets" type="xs:string"/>
 
   <!-- ### This is used differently depending on whether it occurs
        within a "virt_db" or "multi" filter: for the former, it