X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2Fconfig.xsd;h=9911ef8220f29c6bb7a0c7820a3da5883a5e5d7e;hb=c2f71b56603e6a02cea86fe94f6596d242d467b5;hp=52c4f3f98a90b478d338354b4fae40d58f7e5386;hpb=0580853c19dded1da0dc2e26298b1caaeb043e10;p=metaproxy-moved-to-github.git

diff --git a/etc/config.xsd b/etc/config.xsd
index 52c4f3f..9911ef8 100644
--- a/etc/config.xsd
+++ b/etc/config.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: config.xsd,v 1.7 2006-01-16 15:49:27 mike Exp $ -->
+<!-- $Id: config.xsd,v 1.21 2006-08-31 14:18:04 marc 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>
@@ -58,23 +58,76 @@
         <xs:element ref="config:timeout"/>
 
 	<!-- type="log" -->
-        <xs:element ref="config:message"/>
+        <xs:sequence>
+         <xs:element minOccurs="0" ref="config:message"/>
+         <xs:element minOccurs="0" ref="config:filename"/>
+         <xs:element minOccurs="0" name="category">
+           <xs:complexType>
+            <xs:attribute name="request-session" type="xs:boolean"/>
+            <xs:attribute name="response-session" type="xs:boolean"/>
+            <xs:attribute name="session" type="xs:boolean"/>
+            <xs:attribute name="request-apdu" type="xs:boolean"/>
+            <xs:attribute name="response-apdu" type="xs:boolean"/>
+            <xs:attribute name="apdu" type="xs:boolean"/>
+            <xs:attribute name="init-options" type="xs:boolean"/>
+           </xs:complexType>
+         </xs:element>
+        </xs:sequence>
 
 	<!-- type="virt_db" or type="multi" -->
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
+        <xs:sequence>
+	  <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
+	  <xs:element minOccurs="0" maxOccurs="1" name="hideunavailable">
+	    <xs:complexType/>
+	  </xs:element>
+        </xs:sequence>
 
 	<!-- type="auth_simple" -->
-	<xs:element ref="config:filename"/>
+        <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" -->
-	<!-- No example configuration to deduce from yet -->
+        <xs:sequence>
+	  <xs:element minOccurs="0" name="resultset">
+           <xs:complexType>
+            <xs:attribute name="ttl" type="xs:integer"/>
+            <xs:attribute name="max" type="xs:integer"/>
+           </xs:complexType>
+	  </xs:element>
+	  <xs:element minOccurs="0" name="session">
+           <xs:complexType>
+            <xs:attribute name="ttl" type="xs:integer"/>
+           </xs:complexType>
+	  </xs:element>
+	</xs:sequence>
 
 	<!-- type="template" -->
 	<!-- No example configuration to deduce from yet -->
 
+	<!-- type="http_file" -->
+        <xs:sequence>
+	  <xs:element ref="config:mimetypes"/>
+	  <xs:element name="area">
+	    <xs:complexType>
+	      <xs:sequence>
+		<xs:element ref="config:documentroot"/>
+		<xs:element ref="config:prefix"/>
+	      </xs:sequence>
+	    </xs:complexType>
+	  </xs:element>
+        </xs:sequence>
+
+	<!-- type="query_rewrite" -->
+	<xs:element ref="config:xslt"/>
+
       </xs:choice>
       <xs:attribute name="id" type="xs:NCName"/>
       <xs:attribute name="refid" type="xs:NCName"/>
@@ -87,9 +140,12 @@
             <xs:enumeration value="virt_db"/>
             <xs:enumeration value="auth_simple"/>
             <xs:enumeration value="backend_test"/>
+            <xs:enumeration value="bounce"/>
             <xs:enumeration value="multi"/>
             <xs:enumeration value="session_shared"/>
             <xs:enumeration value="template"/>
+            <xs:enumeration value="http_file"/>
+            <xs:enumeration value="query_rewrite"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -100,7 +156,14 @@
   <xs:element name="port" type="xs:string"/>
   <xs:element name="timeout" type="xs:integer"/>
   <xs:element name="message" type="xs:NCName"/>
-  <xs:element name="filename" type="xs:NCName"/>
+  <xs:element name="filename" type="xs:string"/>
+  <xs:element name="userRegister" type="xs:string"/>
+  <xs:element name="targetRegister" type="xs:string"/>
+  <xs:element name="discardUnauthorisedTargets" type="xs:string"/>
+  <xs:element name="mimetypes" type="xs:string"/>
+  <xs:element name="documentroot" type="xs:string"/>
+  <xs:element name="prefix" type="xs:string"/>
+  <xs:element name="xslt" type="xs:string"/>
 
   <!-- ### This is used differently depending on whether it occurs
        within a "virt_db" or "multi" filter: for the former, it
@@ -126,7 +189,7 @@
   <xs:element name="routes">
     <xs:complexType>
       <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="config:route"/>
+        <xs:element minOccurs="1" maxOccurs="unbounded" ref="config:route"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>