X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=etc%2Fconfig.xsd;h=1757d5ec7ec1d9da590edb6d483627882d570fea;hb=2cba4785af6805073e452d295fb9a0d717e41513;hp=c612b92bd0a0b981d714af1d65dd653cb5bd7c7d;hpb=deb2db9e16d79e894b2b967101c530d2ac1417f1;p=metaproxy-moved-to-github.git

diff --git a/etc/config.xsd b/etc/config.xsd
index c612b92..1757d5e 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.10 2006-01-18 10:29:50 mike Exp $ -->
+<!-- $Id: config.xsd,v 1.15 2006-03-30 11:21:18 mike Exp $ -->
 <!--
 	This Schema prescribes the format of YP2 configuration files.
 	Invoke it like this:
@@ -64,8 +64,13 @@
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="config:virtual"/>
 
 	<!-- type="auth_simple" -->
-	<xs:element minOccurs="0" ref="config:userRegister"/>
-	<xs:element minOccurs="0" ref="config:targetRegister"/>
+        <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 -->
@@ -76,6 +81,22 @@
 	<!-- 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="http_file" -->
+	<xs:element ref="config:xslt"/>
+
       </xs:choice>
       <xs:attribute name="id" type="xs:NCName"/>
       <xs:attribute name="refid" type="xs:NCName"/>
@@ -91,6 +112,8 @@
             <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>
@@ -103,6 +126,11 @@
   <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"/>
+  <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
@@ -128,7 +156,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>