X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=xml%2Fschema%2Fmetaproxy.rnc;h=3442c35979a49ae47bd01c073ffd15e4309486aa;hb=9633f388601013d6a4de9367a307dfe647dbbaa6;hp=8f67dbf8e20405e93f69386d0c6532574ffa7e85;hpb=b9a2c9c658b95608dd4be2fed43cf889a1c6ee5a;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 8f67dbf..3442c35 100644
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,139 +1,93 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.3 2006-10-06 22:42:24 marc Exp $
-#
-#   Copyright (c) 2005-2006, Index Data.
-#
+# 
+#   Copyright (C) 2005-2012 Index Data.
+# 
 #   See the LICENSE file for details
-#
-#
+# 
+# 
 # The RelaxNG Compact Syntax file 'metaproxy.rnc' is the master copy.
-#
+# 
 # The RelaxNG XML Syntax and XML Schema are generated using 'trang':
 # trang metaproxy.rnc metaproxy.rng 
 # trang metaproxy.rnc metaproxy.xsd 
-#
+# 
 # Config file validation is done using 'xmllint':
 # xmllint -/-relaxng metaproxy.rng ../../../etc/config1.xml 
-# xmllint --schema metaproxy.xsd config-bytarget.xml
-#
+# xmllint -/-schema metaproxy.xsd config-bytarget.xml
+# 
 # For information on RelaxNG see http://relaxng.org 
 # see also http://books.xmlschemata.org/relaxng/
 
-default namespace = "http://indexdata.dk/yp2/config/1"
-
-start = metaproxy
-
-metaproxy = 
-  element yp2 {
-    element start {
-      attribute route { xsd:NCName }
+namespace mp = "http://indexdata.com/metaproxy"
+
+start |= metaproxy
+
+include "filter_auth_simple.rnc"
+include "filter_backend_test.rnc"
+include "filter_bounce.rnc"
+include "filter_cgi.rnc"
+include "filter_cql_rpn.rnc"
+include "filter_frontend_net.rnc"
+include "filter_http_file.rnc"
+include "filter_limit.rnc"
+include "filter_load_balance.rnc"
+include "filter_log.rnc"
+include "filter_multi.rnc"
+include "filter_query_rewrite.rnc"
+include "filter_record_transform.rnc"
+include "filter_session_shared.rnc"
+include "filter_sru_z3950.rnc"
+include "filter_virt_db.rnc"
+include "filter_z3950_client.rnc"
+include "filter_zoom.rnc"
+
+any = (text | element * { attribute * { text }*, any })*
+
+metaproxy =
+  element mp:metaproxy {
+    attribute version { "1.0" },
+    element mp:dlpath { xsd:string }?,
+    element mp:start {
+            attribute route { xsd:NCName }
     },
-    element filters { filter+ }?,
-    element routes {
-        route+
-    }
+    element mp:filters { filter+ }?,
+    element mp:routes { route+ }
   }
 
-route =  element route {
+route =
+  element mp:route {
     attribute id { xsd:NCName },
-    filter+
-}
-
-filter = 
-  element filter {
-   ( filter_refid
-   | filter_auth_simple
-   | filter_backend_test
-   | filter_bounce
-   | filter_frontend_net
-   | filter_http_file
-   | filter_log
-   | filter_multi
-   | filter_query_rewrite
-   | filter_virt_db
-   | filter_z3950_client
-   )
-}
-
-filter_refid = attribute refid { xsd:NCName }
-
-filter_auth_simple = 
-    attribute type { "auth_simple" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element userRegister { xsd:string }?,
-    element targetRegister { xsd:string }?,
-    element discardUnauthorisedTargets { empty }?
-
-filter_backend_test = 
-    attribute type { "backend_test" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?
-
-filter_bounce = 
-    attribute type { "bounce" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?
-
-filter_frontend_net = 
-    attribute type { "frontend_net" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element threads { xsd:integer }?,
-    element port { xsd:string }
-
-filter_http_file = 
-    attribute type { "http_file" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element mimetypes { xsd:string },
-    element area { 
-        element documentroot { xsd:string },
-        element prefix { xsd:string }
-    }
-
-filter_log = 
-    attribute type { "log" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element message { xsd:NCName },
-    element filename { xsd:string }?,
-    element category {
-        attribute request-session { xsd:boolean }?, 
-        attribute response-session { xsd:boolean }?, 
-        attribute request-apdu { xsd:boolean }?, 
-        attribute response-apdu { xsd:boolean }? 
-    }?
-
-filter_multi = 
-    attribute type { "multi" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element target {
-        attribute route { xsd:string },
-        xsd:string
-    }*,
-    element hideunavailable { empty }?
+    filters+
+  }
 
-filter_query_rewrite = 
-    attribute type { "query_rewrite" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element xslt { xsd:string }
+filters =
+  filter |
+  element mp:filters {
+    filters+
+  }
 
-filter_virt_db = 
-    attribute type { "virt_db" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element virtual {
-       attribute route { xsd:NCName }?,
-       element database { xsd:NCName },
-       element target  { xsd:string }+
-    }+
+filter =
+  element mp:filter {
+    filter_refid
+    | filter_auth_simple
+    | filter_backend_test
+    | filter_bounce
+    | filter_cgi
+    | filter_cql_rpn
+    | filter_frontend_net
+    | filter_http_file
+    | filter_limit
+    | filter_load_balance
+    | filter_log
+    | filter_multi
+    | filter_query_rewrite
+    | filter_record_transform
+    | filter_session_shared
+    | filter_sru_z3950
+    | filter_virt_db
+    | filter_z3950_client
+    | filter_zoom
+  }
 
-filter_z3950_client = 
-    attribute type { "z3950_client" },
-    attribute id { xsd:NCName }?,
-    attribute name { xsd:NCName }?,
-    element timeout { xsd:integer }
+filter_refid = attribute refid { xsd:NCName }