From 2e476ab60877fa26fa0dbe141e98483022f20867 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 16 Aug 2011 13:53:56 +0200
Subject: [PATCH] Don't rely on trang anymore for Git checkout builds

Configuration in etc will only be properly validated if trang is
available. From now on only relax NC files are bundled with the
source dist.
---
 etc/Makefile.am                        |    6 +-
 xml/schema/.gitignore                  |    2 +
 xml/schema/Makefile.am                 |   69 +++--------
 xml/schema/filter_auth_simple.rng      |   34 -----
 xml/schema/filter_auth_simple.xsd      |   29 -----
 xml/schema/filter_backend_test.rng     |   19 ---
 xml/schema/filter_backend_test.xsd     |   17 ---
 xml/schema/filter_bounce.rng           |   19 ---
 xml/schema/filter_bounce.xsd           |   17 ---
 xml/schema/filter_cgi.rng              |   19 ---
 xml/schema/filter_cgi.xsd              |   26 ----
 xml/schema/filter_cql_rpn.rng          |   24 ----
 xml/schema/filter_cql_rpn.xsd          |   22 ----
 xml/schema/filter_frontend_net.rng     |   44 -------
 xml/schema/filter_frontend_net.xsd     |   37 ------
 xml/schema/filter_http_file.rng        |   30 -----
 xml/schema/filter_http_file.xsd        |   34 -----
 xml/schema/filter_limit.rng            |   33 -----
 xml/schema/filter_limit.xsd            |   28 -----
 xml/schema/filter_load_balance.rng     |   39 ------
 xml/schema/filter_load_balance.xsd     |   37 ------
 xml/schema/filter_log.rng              |  103 ----------------
 xml/schema/filter_log.xsd              |   61 ---------
 xml/schema/filter_multi.rng            |   37 ------
 xml/schema/filter_multi.xsd            |   37 ------
 xml/schema/filter_query_rewrite.rng    |   24 ----
 xml/schema/filter_query_rewrite.xsd    |   22 ----
 xml/schema/filter_record_transform.rng |   21 ----
 xml/schema/filter_record_transform.xsd |   31 -----
 xml/schema/filter_session_shared.rng   |   39 ------
 xml/schema/filter_session_shared.xsd   |   35 ------
 xml/schema/filter_sru_z3950.rng        |   27 ----
 xml/schema/filter_sru_z3950.xsd        |   31 -----
 xml/schema/filter_virt_db.rng          |   41 -------
 xml/schema/filter_virt_db.xsd          |   33 -----
 xml/schema/filter_z3950_client.rng     |   39 ------
 xml/schema/filter_z3950_client.xsd     |   28 -----
 xml/schema/filter_zoom.rng             |  211 --------------------------------
 xml/schema/filter_zoom.xsd             |  131 --------------------
 xml/schema/local.xsd                   |    9 --
 xml/schema/metaproxy.rng               |  130 --------------------
 xml/schema/metaproxy.xsd               |  141 ---------------------
 xml/schema/retrievalinfo.rng           |   98 ---------------
 xml/schema/retrievalinfo.xsd           |   64 ----------
 44 files changed, 22 insertions(+), 1956 deletions(-)
 delete mode 100644 xml/schema/filter_auth_simple.rng
 delete mode 100644 xml/schema/filter_auth_simple.xsd
 delete mode 100644 xml/schema/filter_backend_test.rng
 delete mode 100644 xml/schema/filter_backend_test.xsd
 delete mode 100644 xml/schema/filter_bounce.rng
 delete mode 100644 xml/schema/filter_bounce.xsd
 delete mode 100644 xml/schema/filter_cgi.rng
 delete mode 100644 xml/schema/filter_cgi.xsd
 delete mode 100644 xml/schema/filter_cql_rpn.rng
 delete mode 100644 xml/schema/filter_cql_rpn.xsd
 delete mode 100644 xml/schema/filter_frontend_net.rng
 delete mode 100644 xml/schema/filter_frontend_net.xsd
 delete mode 100644 xml/schema/filter_http_file.rng
 delete mode 100644 xml/schema/filter_http_file.xsd
 delete mode 100644 xml/schema/filter_limit.rng
 delete mode 100644 xml/schema/filter_limit.xsd
 delete mode 100644 xml/schema/filter_load_balance.rng
 delete mode 100644 xml/schema/filter_load_balance.xsd
 delete mode 100644 xml/schema/filter_log.rng
 delete mode 100644 xml/schema/filter_log.xsd
 delete mode 100644 xml/schema/filter_multi.rng
 delete mode 100644 xml/schema/filter_multi.xsd
 delete mode 100644 xml/schema/filter_query_rewrite.rng
 delete mode 100644 xml/schema/filter_query_rewrite.xsd
 delete mode 100644 xml/schema/filter_record_transform.rng
 delete mode 100644 xml/schema/filter_record_transform.xsd
 delete mode 100644 xml/schema/filter_session_shared.rng
 delete mode 100644 xml/schema/filter_session_shared.xsd
 delete mode 100644 xml/schema/filter_sru_z3950.rng
 delete mode 100644 xml/schema/filter_sru_z3950.xsd
 delete mode 100644 xml/schema/filter_virt_db.rng
 delete mode 100644 xml/schema/filter_virt_db.xsd
 delete mode 100644 xml/schema/filter_z3950_client.rng
 delete mode 100644 xml/schema/filter_z3950_client.xsd
 delete mode 100644 xml/schema/filter_zoom.rng
 delete mode 100644 xml/schema/filter_zoom.xsd
 delete mode 100644 xml/schema/local.xsd
 delete mode 100644 xml/schema/metaproxy.rng
 delete mode 100644 xml/schema/metaproxy.xsd
 delete mode 100644 xml/schema/retrievalinfo.rng
 delete mode 100644 xml/schema/retrievalinfo.xsd

diff --git a/etc/Makefile.am b/etc/Makefile.am
index d3a76b1..e979a09 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -34,8 +34,10 @@ etcdata_DATA = $(xmlconfig) $(config)
 EXTRA_DIST = $(etcdata_DATA) cgi.sh
 
 .PHONY: check_rng
-check_rng: 
-	xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
+check_rng:
+	if test -f $(rng); then \
+		xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig); \
+	fi
 
 ## Only run XSD checks for a "new" Libxml2
 .PHONY: check_xsd
diff --git a/xml/schema/.gitignore b/xml/schema/.gitignore
index 282522d..bbf8a1f 100644
--- a/xml/schema/.gitignore
+++ b/xml/schema/.gitignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+*.rng
+*.xsd
diff --git a/xml/schema/Makefile.am b/xml/schema/Makefile.am
index 93cfcdb..ce4e84f 100644
--- a/xml/schema/Makefile.am
+++ b/xml/schema/Makefile.am
@@ -1,54 +1,8 @@
 
-TRANG=trang
-# TRANG=java -jar /home/adam/proj/trang-20081028/trang.jar
+TRANG=/usr/bin/trang
 
 xmlschemadatadir = $(pkgdatadir)/xml/schema
 
-xsd = \
-filter_auth_simple.xsd \
-filter_backend_test.xsd \
-filter_bounce.xsd \
-filter_cgi.xsd \
-filter_cql_rpn.xsd \
-filter_frontend_net.xsd \
-filter_http_file.xsd \
-filter_limit.xsd \
-filter_load_balance.xsd \
-filter_log.xsd \
-filter_multi.xsd \
-filter_query_rewrite.xsd \
-filter_record_transform.xsd \
-filter_session_shared.xsd \
-filter_sru_z3950.xsd \
-filter_virt_db.xsd \
-filter_z3950_client.xsd \
-filter_zoom.xsd \
-local.xsd \
-metaproxy.xsd \
-retrievalinfo.xsd
-
-rng = \
-filter_auth_simple.rng \
-filter_backend_test.rng \
-filter_bounce.rng \
-filter_cgi.rng \
-filter_cql_rpn.rng \
-filter_frontend_net.rng \
-filter_http_file.rng \
-filter_limit.rng \
-filter_load_balance.rng \
-filter_log.rng \
-filter_multi.rng \
-filter_query_rewrite.rng \
-filter_record_transform.rng \
-filter_session_shared.rng \
-filter_sru_z3950.rng \
-filter_virt_db.rng \
-filter_z3950_client.rng \
-filter_zoom.rng \
-metaproxy.rng \
-retrievalinfo.rng
-
 rnc =  \
 filter_auth_simple.rnc \
 filter_backend_test.rnc \
@@ -71,12 +25,21 @@ filter_zoom.rnc \
 metaproxy.rnc \
 retrievalinfo.rnc
 
-xmlschemadata_DATA = $(xsd) $(rng) $(rnc)
+noinst_DATA = metaproxy.rng metaproxy.xsd
+
+xmlschemadata_DATA = $(rnc)
+
+EXTRA_DIST = $(rnc)
 
-EXTRA_DIST = $(xmlschemadata_DATA)
+clean:
+	rm -f *.xsd *.rng
 
-$(rng):$(rnc)
-	$(TRANG) metaproxy.rnc metaproxy.rng
+metaproxy.rng:$(rnc)
+	if test -x $(TRANG); then \
+		$(TRANG) metaproxy.rnc metaproxy.rng; \
+	fi
 
-$(xsd):$(rnc)
-	$(TRANG) metaproxy.rnc metaproxy.xsd
+metaproxy.xsd:$(rnc)
+	if test -x $(TRANG); then \
+		$(TRANG) metaproxy.rnc metaproxy.xsd; \
+	fi
diff --git a/xml/schema/filter_auth_simple.rng b/xml/schema/filter_auth_simple.rng
deleted file mode 100644
index 1cc92d0..0000000
--- a/xml/schema/filter_auth_simple.rng
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_auth_simple">
-    <attribute name="type">
-      <value>auth_simple</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:userRegister">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:targetRegister">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:discardUnauthorisedTargets">
-        <empty/>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_auth_simple.xsd b/xml/schema/filter_auth_simple.xsd
deleted file mode 100644
index c2eda0e..0000000
--- a/xml/schema/filter_auth_simple.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_auth_simple">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:userRegister"/>
-      <xs:element minOccurs="0" ref="mp:targetRegister"/>
-      <xs:element minOccurs="0" ref="mp:discardUnauthorisedTargets"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="userRegister" type="xs:string"/>
-  <xs:element name="targetRegister" type="xs:string"/>
-  <xs:element name="discardUnauthorisedTargets">
-    <xs:complexType/>
-  </xs:element>
-  <xs:attributeGroup name="filter_auth_simple">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="auth_simple"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_backend_test.rng b/xml/schema/filter_backend_test.rng
deleted file mode 100644
index 0e71c96..0000000
--- a/xml/schema/filter_backend_test.rng
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_backend_test">
-    <attribute name="type">
-      <value>backend_test</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_backend_test.xsd b/xml/schema/filter_backend_test.xsd
deleted file mode 100644
index e43bad7..0000000
--- a/xml/schema/filter_backend_test.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import namespace="http://indexdata.com/metaproxy" schemaLocation="metaproxy.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:attributeGroup name="filter_backend_test">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="backend_test"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_bounce.rng b/xml/schema/filter_bounce.rng
deleted file mode 100644
index b1b92c9..0000000
--- a/xml/schema/filter_bounce.rng
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_bounce">
-    <attribute name="type">
-      <value>bounce</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_bounce.xsd b/xml/schema/filter_bounce.xsd
deleted file mode 100644
index f828a72..0000000
--- a/xml/schema/filter_bounce.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import namespace="http://indexdata.com/metaproxy" schemaLocation="metaproxy.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:attributeGroup name="filter_bounce">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="bounce"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_cgi.rng b/xml/schema/filter_cgi.rng
deleted file mode 100644
index 7a7ab31..0000000
--- a/xml/schema/filter_cgi.rng
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_cgi">
-    <attribute name="type">
-      <value>cgi</value>
-    </attribute>
-    <zeroOrMore>
-      <element name="mp:map">
-        <attribute name="path">
-          <data type="string"/>
-        </attribute>
-        <attribute name="exec">
-          <data type="string"/>
-        </attribute>
-      </element>
-    </zeroOrMore>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_cgi.xsd b/xml/schema/filter_cgi.xsd
deleted file mode 100644
index a01e4e5..0000000
--- a/xml/schema/filter_cgi.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_cgi">
-    <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:map"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="map">
-    <xs:complexType>
-      <xs:attribute name="path" use="required" type="xs:string"/>
-      <xs:attribute name="exec" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_cgi">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="cgi"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_cql_rpn.rng b/xml/schema/filter_cql_rpn.rng
deleted file mode 100644
index 992d137..0000000
--- a/xml/schema/filter_cql_rpn.rng
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_cql_rpn">
-    <attribute name="type">
-      <value>cql_rpn</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <element name="mp:conversion">
-      <attribute name="file">
-        <data type="string"/>
-      </attribute>
-    </element>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_cql_rpn.xsd b/xml/schema/filter_cql_rpn.xsd
deleted file mode 100644
index 8446a74..0000000
--- a/xml/schema/filter_cql_rpn.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:element name="conversion">
-    <xs:complexType>
-      <xs:attribute name="file" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_cql_rpn">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="cql_rpn"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_frontend_net.rng b/xml/schema/filter_frontend_net.rng
deleted file mode 100644
index 0a42a7b..0000000
--- a/xml/schema/filter_frontend_net.rng
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schemas -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_frontend_net">
-    <attribute name="type">
-      <value>frontend_net</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:threads">
-        <data type="integer"/>
-      </element>
-    </optional>
-    <oneOrMore>
-      <element name="mp:port">
-        <optional>
-          <attribute name="route">
-            <data type="NCName"/>
-          </attribute>
-        </optional>
-        <data type="string"/>
-      </element>
-    </oneOrMore>
-    <optional>
-      <element name="mp:timeout">
-        <data type="integer"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:connect-max">
-        <data type="integer"/>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_frontend_net.xsd b/xml/schema/filter_frontend_net.xsd
deleted file mode 100644
index c141883..0000000
--- a/xml/schema/filter_frontend_net.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schemas -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_frontend_net">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:threads"/>
-      <xs:element maxOccurs="unbounded" ref="mp:port"/>
-      <xs:element minOccurs="0" ref="mp:timeout"/>
-      <xs:element minOccurs="0" ref="mp:connect-max"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="threads" type="xs:integer"/>
-  <xs:element name="port">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:string">
-          <xs:attribute name="route" type="xs:NCName"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="timeout" type="xs:integer"/>
-  <xs:element name="connect-max" type="xs:integer"/>
-  <xs:attributeGroup name="filter_frontend_net">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="frontend_net"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_http_file.rng b/xml/schema/filter_http_file.rng
deleted file mode 100644
index 607a83a..0000000
--- a/xml/schema/filter_http_file.rng
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_http_file">
-    <attribute name="type">
-      <value>http_file</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <element name="mp:mimetypes">
-      <data type="string"/>
-    </element>
-    <element name="mp:area">
-      <element name="mp:documentroot">
-        <data type="string"/>
-      </element>
-      <element name="mp:prefix">
-        <data type="string"/>
-      </element>
-    </element>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_http_file.xsd b/xml/schema/filter_http_file.xsd
deleted file mode 100644
index 33940ff..0000000
--- a/xml/schema/filter_http_file.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_http_file">
-    <xs:sequence>
-      <xs:element ref="mp:mimetypes"/>
-      <xs:element ref="mp:area"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="mimetypes" type="xs:string"/>
-  <xs:element name="area">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="mp:documentroot"/>
-        <xs:element ref="mp:prefix"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="documentroot" type="xs:string"/>
-  <xs:element name="prefix" type="xs:string"/>
-  <xs:attributeGroup name="filter_http_file">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="http_file"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_limit.rng b/xml/schema/filter_limit.rng
deleted file mode 100644
index 8932450..0000000
--- a/xml/schema/filter_limit.rng
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_limit">
-    <attribute name="type">
-      <value>limit</value>
-    </attribute>
-    <optional>
-      <element name="mp:limit">
-        <optional>
-          <attribute name="bandwidth">
-            <data type="integer"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="pdu">
-            <data type="integer"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="search">
-            <data type="integer"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="retrieve">
-            <data type="integer"/>
-          </attribute>
-        </optional>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_limit.xsd b/xml/schema/filter_limit.xsd
deleted file mode 100644
index a051687..0000000
--- a/xml/schema/filter_limit.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_limit">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:limit"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="limit">
-    <xs:complexType>
-      <xs:attribute name="bandwidth" type="xs:integer"/>
-      <xs:attribute name="pdu" type="xs:integer"/>
-      <xs:attribute name="search" type="xs:integer"/>
-      <xs:attribute name="retrieve" type="xs:integer"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_limit">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="limit"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_load_balance.rng b/xml/schema/filter_load_balance.rng
deleted file mode 100644
index f31cd8a..0000000
--- a/xml/schema/filter_load_balance.rng
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 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
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_load_balance">
-    <attribute name="type">
-      <value>load_balance</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_load_balance.xsd b/xml/schema/filter_load_balance.xsd
deleted file mode 100644
index 39b9136..0000000
--- a/xml/schema/filter_load_balance.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 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
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import namespace="http://indexdata.com/metaproxy" schemaLocation="metaproxy.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:attributeGroup name="filter_load_balance">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="load_balance"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_log.rng b/xml/schema/filter_log.rng
deleted file mode 100644
index 5b2cbaa..0000000
--- a/xml/schema/filter_log.rng
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 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
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_log">
-    <attribute name="type">
-      <value>log</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:message">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:time-format">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:filename">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:category">
-        <optional>
-          <attribute name="user-access">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="access">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="init-options">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="request-session">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="response-session">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="session">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="apdu">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="request-apdu">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="response-apdu">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_log.xsd b/xml/schema/filter_log.xsd
deleted file mode 100644
index 1682ea4..0000000
--- a/xml/schema/filter_log.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 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
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_log">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:message"/>
-      <xs:element minOccurs="0" ref="mp:time-format"/>
-      <xs:element minOccurs="0" ref="mp:filename"/>
-      <xs:element minOccurs="0" ref="mp:category"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="message" type="xs:string"/>
-  <xs:element name="time-format" type="xs:string"/>
-  <xs:element name="filename" type="xs:string"/>
-  <xs:element name="category">
-    <xs:complexType>
-      <xs:attribute name="user-access" type="xs:boolean"/>
-      <xs:attribute name="access" type="xs:boolean"/>
-      <xs:attribute name="init-options" type="xs:boolean"/>
-      <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="apdu" type="xs:boolean"/>
-      <xs:attribute name="request-apdu" type="xs:boolean"/>
-      <xs:attribute name="response-apdu" type="xs:boolean"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_log">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="log"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_multi.rng b/xml/schema/filter_multi.rng
deleted file mode 100644
index d0d4b00..0000000
--- a/xml/schema/filter_multi.rng
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_multi">
-    <attribute name="type">
-      <value>multi</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <zeroOrMore>
-      <element name="mp:target">
-        <attribute name="route">
-          <data type="string"/>
-        </attribute>
-        <data type="string"/>
-      </element>
-    </zeroOrMore>
-    <optional>
-      <element name="mp:hideunavailable">
-        <empty/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:mergetype">
-        <data type="string"/>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_multi.xsd b/xml/schema/filter_multi.xsd
deleted file mode 100644
index 0ad68d9..0000000
--- a/xml/schema/filter_multi.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_multi">
-    <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:target"/>
-      <xs:element minOccurs="0" ref="mp:hideunavailable"/>
-      <xs:element minOccurs="0" ref="mp:mergetype"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="target">
-    <xs:complexType>
-      <xs:simpleContent>
-        <xs:extension base="xs:string">
-          <xs:attribute name="route" use="required" type="xs:string"/>
-        </xs:extension>
-      </xs:simpleContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="hideunavailable">
-    <xs:complexType/>
-  </xs:element>
-  <xs:element name="mergetype" type="xs:string"/>
-  <xs:attributeGroup name="filter_multi">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="multi"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_query_rewrite.rng b/xml/schema/filter_query_rewrite.rng
deleted file mode 100644
index a64c4de..0000000
--- a/xml/schema/filter_query_rewrite.rng
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_query_rewrite">
-    <attribute name="type">
-      <value>query_rewrite</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <element name="mp:xslt">
-      <attribute name="stylesheet">
-        <data type="string"/>
-      </attribute>
-    </element>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_query_rewrite.xsd b/xml/schema/filter_query_rewrite.xsd
deleted file mode 100644
index f1d95e6..0000000
--- a/xml/schema/filter_query_rewrite.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:element name="xslt">
-    <xs:complexType>
-      <xs:attribute name="stylesheet" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_query_rewrite">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="query_rewrite"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_record_transform.rng b/xml/schema/filter_record_transform.rng
deleted file mode 100644
index a31b397..0000000
--- a/xml/schema/filter_record_transform.rng
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="retrievalinfo.rng"/>
-  <define name="filter_record_transform">
-    <attribute name="type">
-      <value>record_transform</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <ref name="retrievalinfo"/>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_record_transform.xsd b/xml/schema/filter_record_transform.xsd
deleted file mode 100644
index 9ac6160..0000000
--- a/xml/schema/filter_record_transform.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import namespace="http://indexdata.com/metaproxy" schemaLocation="metaproxy.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:element name="filter_record_transform" abstract="true">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="y:retrieval"/>
-      </xs:sequence>
-      <xs:attribute name="version" use="required">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="1.0"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_record_transform">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="record_transform"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_session_shared.rng b/xml/schema/filter_session_shared.rng
deleted file mode 100644
index 8507bad..0000000
--- a/xml/schema/filter_session_shared.rng
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_session_shared">
-    <attribute name="type">
-      <value>session_shared</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:resultset">
-        <attribute name="max">
-          <data type="integer"/>
-        </attribute>
-        <attribute name="ttl">
-          <data type="integer"/>
-        </attribute>
-        <attribute name="optimizesearch">
-          <data type="boolean"/>
-        </attribute>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:session">
-        <attribute name="ttl">
-          <data type="integer"/>
-        </attribute>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_session_shared.xsd b/xml/schema/filter_session_shared.xsd
deleted file mode 100644
index 5ad9d2f..0000000
--- a/xml/schema/filter_session_shared.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_session_shared">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:resultset"/>
-      <xs:element minOccurs="0" ref="mp:session"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="resultset">
-    <xs:complexType>
-      <xs:attribute name="max" use="required" type="xs:integer"/>
-      <xs:attribute name="ttl" use="required" type="xs:integer"/>
-      <xs:attribute name="optimizesearch" use="required" type="xs:boolean"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="session">
-    <xs:complexType>
-      <xs:attribute name="ttl" use="required" type="xs:integer"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_session_shared">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="session_shared"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_sru_z3950.rng b/xml/schema/filter_sru_z3950.rng
deleted file mode 100644
index e9b901d..0000000
--- a/xml/schema/filter_sru_z3950.rng
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_sru_z3950">
-    <attribute name="type">
-      <value>sru_z3950</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <zeroOrMore>
-      <element name="mp:database">
-        <attribute name="name">
-          <data type="NCName"/>
-        </attribute>
-        <ref name="any"/>
-      </element>
-    </zeroOrMore>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_sru_z3950.xsd b/xml/schema/filter_sru_z3950.xsd
deleted file mode 100644
index e23460d..0000000
--- a/xml/schema/filter_sru_z3950.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_sru_z3950">
-    <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:database"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="database">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="mp:any">
-          <xs:attribute name="name" use="required" type="xs:NCName"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_sru_z3950">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="sru_z3950"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_virt_db.rng b/xml/schema/filter_virt_db.rng
deleted file mode 100644
index f6708ef..0000000
--- a/xml/schema/filter_virt_db.rng
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_virt_db">
-    <attribute name="type">
-      <value>virt_db</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:pass-vhosts">
-        <data type="boolean"/>
-      </element>
-    </optional>
-    <zeroOrMore>
-      <element name="mp:virtual">
-        <optional>
-          <attribute name="route">
-            <data type="NCName"/>
-          </attribute>
-        </optional>
-        <element name="mp:database">
-          <data type="string"/>
-        </element>
-        <oneOrMore>
-          <element name="mp:target">
-            <data type="string"/>
-          </element>
-        </oneOrMore>
-      </element>
-    </zeroOrMore>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_virt_db.xsd b/xml/schema/filter_virt_db.xsd
deleted file mode 100644
index d46362c..0000000
--- a/xml/schema/filter_virt_db.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_virt_db">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:pass-vhosts"/>
-      <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:virtual"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="pass-vhosts" type="xs:boolean"/>
-  <xs:element name="virtual">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="database" type="xs:string"/>
-        <xs:element maxOccurs="unbounded" name="target" type="xs:string"/>
-      </xs:sequence>
-      <xs:attribute name="route" type="xs:NCName"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_virt_db">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="virt_db"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_z3950_client.rng b/xml/schema/filter_z3950_client.rng
deleted file mode 100644
index b7f33db..0000000
--- a/xml/schema/filter_z3950_client.rng
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_z3950_client">
-    <attribute name="type">
-      <value>z3950_client</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:timeout">
-        <data type="integer"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:default_target">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:force_target">
-        <data type="string"/>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:force_close">
-        <data type="boolean"/>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_z3950_client.xsd b/xml/schema/filter_z3950_client.xsd
deleted file mode 100644
index 3ccba0f..0000000
--- a/xml/schema/filter_z3950_client.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_z3950_client">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:timeout"/>
-      <xs:element minOccurs="0" ref="mp:default_target"/>
-      <xs:element minOccurs="0" ref="mp:force_target"/>
-      <xs:element minOccurs="0" ref="mp:force_close"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="default_target" type="xs:string"/>
-  <xs:element name="force_target" type="xs:string"/>
-  <xs:element name="force_close" type="xs:boolean"/>
-  <xs:attributeGroup name="filter_z3950_client">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="z3950_client"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/filter_zoom.rng b/xml/schema/filter_zoom.rng
deleted file mode 100644
index 0c523ed..0000000
--- a/xml/schema/filter_zoom.rng
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="filter_zoom">
-    <attribute name="type">
-      <value>zoom</value>
-    </attribute>
-    <optional>
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="name">
-        <data type="NCName"/>
-      </attribute>
-    </optional>
-    <optional>
-      <element name="mp:torus">
-        <attribute name="url">
-          <data type="string"/>
-        </attribute>
-        <optional>
-          <attribute name="xsldir">
-            <data type="string"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="element_transform">
-            <data type="string"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="element_raw">
-            <data type="string"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="proxy">
-            <data type="string"/>
-          </attribute>
-        </optional>
-        <optional>
-          <element name="mp:records">
-            <zeroOrMore>
-              <element name="mp:record">
-                <optional>
-                  <element name="mp:authentication">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:piggyback">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:queryEncoding">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <element name="mp:udb">
-                  <data type="string"/>
-                </element>
-                <optional>
-                  <element name="mp:cclmap_au">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cclmap_date">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cclmap_isbn">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cclmap_su">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cclmap_term">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cclmap_ti">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:elementSet">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:recordEncoding">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:requestSyntax">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:sru">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:transform">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:urlRecipe">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <element name="mp:zurl">
-                  <data type="string"/>
-                </element>
-                <optional>
-                  <element name="mp:cfAuth">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cfProxy">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:cfSubDb">
-                    <data type="string"/>
-                  </element>
-                </optional>
-                <optional>
-                  <element name="mp:contentConnector">
-                    <data type="string"/>
-                  </element>
-                </optional>
-              </element>
-            </zeroOrMore>
-          </element>
-        </optional>
-      </element>
-    </optional>
-    <zeroOrMore>
-      <element name="mp:fieldmap">
-        <attribute name="cql">
-          <data type="string"/>
-        </attribute>
-        <optional>
-          <attribute name="ccl">
-            <data type="string"/>
-          </attribute>
-        </optional>
-      </element>
-    </zeroOrMore>
-    <optional>
-      <element name="mp:cclmap">
-        <zeroOrMore>
-          <element name="mp:qual">
-            <attribute name="name">
-              <data type="string"/>
-            </attribute>
-            <oneOrMore>
-              <element name="mp:attr">
-                <attribute name="type">
-                  <data type="string"/>
-                </attribute>
-                <attribute name="value">
-                  <data type="string"/>
-                </attribute>
-              </element>
-            </oneOrMore>
-          </element>
-        </zeroOrMore>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:contentProxy">
-        <optional>
-          <attribute name="server">
-            <data type="string"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="tmp_file">
-            <data type="string"/>
-          </attribute>
-        </optional>
-      </element>
-    </optional>
-    <optional>
-      <element name="mp:log">
-        <optional>
-          <attribute name="apdu">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-      </element>
-    </optional>
-  </define>
-</grammar>
diff --git a/xml/schema/filter_zoom.xsd b/xml/schema/filter_zoom.xsd
deleted file mode 100644
index 0e37316..0000000
--- a/xml/schema/filter_zoom.xsd
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Metaproxy XML config file schema -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:group name="filter_zoom">
-    <xs:sequence>
-      <xs:element minOccurs="0" ref="mp:torus"/>
-      <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:fieldmap"/>
-      <xs:element minOccurs="0" ref="mp:cclmap"/>
-      <xs:element minOccurs="0" ref="mp:contentProxy"/>
-      <xs:element minOccurs="0" ref="mp:log"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:element name="torus">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="mp:records"/>
-      </xs:sequence>
-      <xs:attribute name="url" use="required" type="xs:string"/>
-      <xs:attribute name="xsldir" type="xs:string"/>
-      <xs:attribute name="element_transform" type="xs:string"/>
-      <xs:attribute name="element_raw" type="xs:string"/>
-      <xs:attribute name="proxy" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="records">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:record"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="record">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="mp:authentication"/>
-        <xs:element minOccurs="0" ref="mp:piggyback"/>
-        <xs:element minOccurs="0" ref="mp:queryEncoding"/>
-        <xs:element ref="mp:udb"/>
-        <xs:element minOccurs="0" ref="mp:cclmap_au"/>
-        <xs:element minOccurs="0" ref="mp:cclmap_date"/>
-        <xs:element minOccurs="0" ref="mp:cclmap_isbn"/>
-        <xs:element minOccurs="0" ref="mp:cclmap_su"/>
-        <xs:element minOccurs="0" ref="mp:cclmap_term"/>
-        <xs:element minOccurs="0" ref="mp:cclmap_ti"/>
-        <xs:element minOccurs="0" ref="mp:elementSet"/>
-        <xs:element minOccurs="0" ref="mp:recordEncoding"/>
-        <xs:element minOccurs="0" ref="mp:requestSyntax"/>
-        <xs:element minOccurs="0" ref="mp:sru"/>
-        <xs:element minOccurs="0" ref="mp:transform"/>
-        <xs:element minOccurs="0" ref="mp:urlRecipe"/>
-        <xs:element ref="mp:zurl"/>
-        <xs:element minOccurs="0" ref="mp:cfAuth"/>
-        <xs:element minOccurs="0" ref="mp:cfProxy"/>
-        <xs:element minOccurs="0" ref="mp:cfSubDb"/>
-        <xs:element minOccurs="0" ref="mp:contentConnector"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="authentication" type="xs:string"/>
-  <xs:element name="piggyback" type="xs:string"/>
-  <xs:element name="queryEncoding" type="xs:string"/>
-  <xs:element name="udb" type="xs:string"/>
-  <xs:element name="cclmap_au" type="xs:string"/>
-  <xs:element name="cclmap_date" type="xs:string"/>
-  <xs:element name="cclmap_isbn" type="xs:string"/>
-  <xs:element name="cclmap_su" type="xs:string"/>
-  <xs:element name="cclmap_term" type="xs:string"/>
-  <xs:element name="cclmap_ti" type="xs:string"/>
-  <xs:element name="elementSet" type="xs:string"/>
-  <xs:element name="recordEncoding" type="xs:string"/>
-  <xs:element name="requestSyntax" type="xs:string"/>
-  <xs:element name="sru" type="xs:string"/>
-  <xs:element name="transform" type="xs:string"/>
-  <xs:element name="urlRecipe" type="xs:string"/>
-  <xs:element name="zurl" type="xs:string"/>
-  <xs:element name="cfAuth" type="xs:string"/>
-  <xs:element name="cfProxy" type="xs:string"/>
-  <xs:element name="cfSubDb" type="xs:string"/>
-  <xs:element name="contentConnector" type="xs:string"/>
-  <xs:element name="fieldmap">
-    <xs:complexType>
-      <xs:attribute name="cql" use="required" type="xs:string"/>
-      <xs:attribute name="ccl" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="cclmap">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="mp:qual"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="qual">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="mp:attr"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="attr">
-    <xs:complexType>
-      <xs:attribute name="type" use="required" type="xs:string"/>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="contentProxy">
-    <xs:complexType>
-      <xs:attribute name="server" type="xs:string"/>
-      <xs:attribute name="tmp_file" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="log">
-    <xs:complexType>
-      <xs:attribute name="apdu" type="xs:boolean"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_zoom">
-    <xs:attribute name="type" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:enumeration value="zoom"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="id" type="xs:NCName"/>
-    <xs:attribute name="name" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/local.xsd b/xml/schema/local.xsd
deleted file mode 100644
index eea7398..0000000
--- a/xml/schema/local.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:include schemaLocation="filter_backend_test.xsd"/>
-  <xs:include schemaLocation="filter_bounce.xsd"/>
-  <xs:include schemaLocation="filter_load_balance.xsd"/>
-  <xs:include schemaLocation="filter_record_transform.xsd"/>
-  <xs:import namespace="http://indexdata.com/metaproxy" schemaLocation="metaproxy.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-</xs:schema>
diff --git a/xml/schema/metaproxy.rng b/xml/schema/metaproxy.rng
deleted file mode 100644
index 81e8915..0000000
--- a/xml/schema/metaproxy.rng
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 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
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<grammar xmlns:mp="http://indexdata.com/metaproxy" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <start combine="choice">
-    <ref name="metaproxy"/>
-  </start>
-  <include href="filter_auth_simple.rng"/>
-  <include href="filter_backend_test.rng"/>
-  <include href="filter_bounce.rng"/>
-  <include href="filter_cgi.rng"/>
-  <include href="filter_cql_rpn.rng"/>
-  <include href="filter_frontend_net.rng"/>
-  <include href="filter_http_file.rng"/>
-  <include href="filter_limit.rng"/>
-  <include href="filter_load_balance.rng"/>
-  <include href="filter_log.rng"/>
-  <include href="filter_multi.rng"/>
-  <include href="filter_query_rewrite.rng"/>
-  <include href="filter_record_transform.rng"/>
-  <include href="filter_session_shared.rng"/>
-  <include href="filter_sru_z3950.rng"/>
-  <include href="filter_virt_db.rng"/>
-  <include href="filter_z3950_client.rng"/>
-  <include href="filter_zoom.rng"/>
-  <define name="any">
-    <zeroOrMore>
-      <choice>
-        <text/>
-        <element>
-          <anyName/>
-          <zeroOrMore>
-            <attribute>
-              <anyName/>
-            </attribute>
-          </zeroOrMore>
-          <ref name="any"/>
-        </element>
-      </choice>
-    </zeroOrMore>
-  </define>
-  <define name="metaproxy">
-    <element name="mp:metaproxy">
-      <attribute name="version">
-        <value>1.0</value>
-      </attribute>
-      <optional>
-        <element name="mp:dlpath">
-          <data type="string"/>
-        </element>
-      </optional>
-      <element name="mp:start">
-        <attribute name="route">
-          <data type="NCName"/>
-        </attribute>
-      </element>
-      <optional>
-        <element name="mp:filters">
-          <oneOrMore>
-            <ref name="filter"/>
-          </oneOrMore>
-        </element>
-      </optional>
-      <element name="mp:routes">
-        <oneOrMore>
-          <ref name="route"/>
-        </oneOrMore>
-      </element>
-    </element>
-  </define>
-  <define name="route">
-    <element name="mp:route">
-      <attribute name="id">
-        <data type="NCName"/>
-      </attribute>
-      <oneOrMore>
-        <ref name="filter"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="filter">
-    <element name="mp:filter">
-      <choice>
-        <ref name="filter_refid"/>
-        <ref name="filter_auth_simple"/>
-        <ref name="filter_backend_test"/>
-        <ref name="filter_bounce"/>
-        <ref name="filter_cgi"/>
-        <ref name="filter_cql_rpn"/>
-        <ref name="filter_frontend_net"/>
-        <ref name="filter_http_file"/>
-        <ref name="filter_limit"/>
-        <ref name="filter_load_balance"/>
-        <ref name="filter_log"/>
-        <ref name="filter_multi"/>
-        <ref name="filter_query_rewrite"/>
-        <ref name="filter_record_transform"/>
-        <ref name="filter_session_shared"/>
-        <ref name="filter_sru_z3950"/>
-        <ref name="filter_virt_db"/>
-        <ref name="filter_z3950_client"/>
-        <ref name="filter_zoom"/>
-      </choice>
-    </element>
-  </define>
-  <define name="filter_refid">
-    <attribute name="refid">
-      <data type="NCName"/>
-    </attribute>
-  </define>
-</grammar>
diff --git a/xml/schema/metaproxy.xsd b/xml/schema/metaproxy.xsd
deleted file mode 100644
index cedc1ca..0000000
--- a/xml/schema/metaproxy.xsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 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
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/metaproxy" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:include schemaLocation="filter_auth_simple.xsd"/>
-  <xs:include schemaLocation="filter_cgi.xsd"/>
-  <xs:include schemaLocation="filter_cql_rpn.xsd"/>
-  <xs:include schemaLocation="filter_frontend_net.xsd"/>
-  <xs:include schemaLocation="filter_http_file.xsd"/>
-  <xs:include schemaLocation="filter_limit.xsd"/>
-  <xs:include schemaLocation="filter_log.xsd"/>
-  <xs:include schemaLocation="filter_multi.xsd"/>
-  <xs:include schemaLocation="filter_query_rewrite.xsd"/>
-  <xs:include schemaLocation="filter_session_shared.xsd"/>
-  <xs:include schemaLocation="filter_sru_z3950.xsd"/>
-  <xs:include schemaLocation="filter_virt_db.xsd"/>
-  <xs:include schemaLocation="filter_z3950_client.xsd"/>
-  <xs:include schemaLocation="filter_zoom.xsd"/>
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/yaz" schemaLocation="retrievalinfo.xsd"/>
-  <xs:complexType name="any" mixed="true">
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="metaproxy">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="mp:dlpath"/>
-        <xs:element ref="mp:start"/>
-        <xs:element minOccurs="0" ref="mp:filters"/>
-        <xs:element ref="mp:routes"/>
-      </xs:sequence>
-      <xs:attribute name="version" use="required">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="1.0"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="dlpath" type="xs:string"/>
-  <xs:element name="start">
-    <xs:complexType>
-      <xs:attribute name="route" use="required" type="xs:NCName"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="filters">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="mp:filter"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="routes">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="mp:route"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="route">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="mp:filter"/>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:NCName"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="filter">
-    <xs:complexType>
-      <xs:choice minOccurs="0">
-        <xs:group ref="mp:filter_auth_simple"/>
-        <xs:group ref="mp:filter_cgi"/>
-        <xs:element ref="mp:conversion"/>
-        <xs:group ref="mp:filter_frontend_net"/>
-        <xs:group ref="mp:filter_http_file"/>
-        <xs:group ref="mp:filter_limit"/>
-        <xs:group ref="mp:filter_log"/>
-        <xs:group ref="mp:filter_multi"/>
-        <xs:element ref="mp:xslt"/>
-        <xs:element ref="filter_record_transform"/>
-        <xs:group ref="mp:filter_session_shared"/>
-        <xs:group ref="mp:filter_sru_z3950"/>
-        <xs:group ref="mp:filter_virt_db"/>
-        <xs:group ref="mp:filter_z3950_client"/>
-        <xs:group ref="mp:filter_zoom"/>
-      </xs:choice>
-      <xs:attribute name="type">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="auth_simple"/>
-            <xs:enumeration value="backend_test"/>
-            <xs:enumeration value="bounce"/>
-            <xs:enumeration value="cgi"/>
-            <xs:enumeration value="cql_rpn"/>
-            <xs:enumeration value="frontend_net"/>
-            <xs:enumeration value="http_file"/>
-            <xs:enumeration value="limit"/>
-            <xs:enumeration value="load_balance"/>
-            <xs:enumeration value="log"/>
-            <xs:enumeration value="multi"/>
-            <xs:enumeration value="query_rewrite"/>
-            <xs:enumeration value="record_transform"/>
-            <xs:enumeration value="session_shared"/>
-            <xs:enumeration value="sru_z3950"/>
-            <xs:enumeration value="virt_db"/>
-            <xs:enumeration value="z3950_client"/>
-            <xs:enumeration value="zoom"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="refid" type="xs:NCName"/>
-      <xs:attribute name="id" type="xs:NCName"/>
-      <xs:attribute name="name" type="xs:NCName"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:attributeGroup name="filter_refid">
-    <xs:attribute name="refid" use="required" type="xs:NCName"/>
-  </xs:attributeGroup>
-</xs:schema>
diff --git a/xml/schema/retrievalinfo.rng b/xml/schema/retrievalinfo.rng
deleted file mode 100644
index 5056537..0000000
--- a/xml/schema/retrievalinfo.rng
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 Index Data.
-  
-    See the LICENSE file for details
-  
-  
-  The RelaxNG Compact Syntax file 'retrievalinfo.rnc' is the master copy.
-  
-  The RelaxNG XML Syntax and XML Schema are generated using 'trang':
-  trang retrievalinfo.rnc retrievalinfo.rng 
-  trang retrievalinfo.rnc retrievalinfo.xsd 
-  
-  Config file validation is done using 'xmllint':
-  xmllint -/-relaxng retrievalinfo.rng retrievalinfo.xml 
-  xmllint -/-schema retrievalinfo.xsd retirevalinfo.xml
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<grammar xmlns:y="http://indexdata.com/yaz" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!--
-    need to be in different namespace then metaproxy, otherwise 
-    xslt element definition clashes in XML Schema files
-    namespace y = "http://indexdata.com/metaproxy"
-  -->
-  <start combine="choice">
-    <ref name="retrievalinfo"/>
-  </start>
-  <define name="marc">
-    <element name="y:marc">
-      <attribute name="inputformat">
-        <data type="string"/>
-      </attribute>
-      <attribute name="outputformat">
-        <data type="string"/>
-      </attribute>
-      <attribute name="inputcharset">
-        <data type="string"/>
-      </attribute>
-    </element>
-  </define>
-  <define name="xslt">
-    <element name="y:xslt">
-      <attribute name="stylesheet">
-        <data type="string"/>
-      </attribute>
-    </element>
-  </define>
-  <define name="retrievalinfo">
-    <element name="y:retrievalinfo">
-      <attribute name="version">
-        <value>1.0</value>
-      </attribute>
-      <oneOrMore>
-        <element name="y:retrieval">
-          <attribute name="syntax">
-            <data type="string"/>
-          </attribute>
-          <optional>
-            <attribute name="name">
-              <data type="string"/>
-            </attribute>
-          </optional>
-          <optional>
-            <attribute name="identifier">
-              <data type="string"/>
-            </attribute>
-          </optional>
-          <optional>
-            <!--
-              attribute backendsyntax { xsd:string }?,
-              attribute backendname { xsd:string }?,
-            -->
-            <element name="y:backend">
-              <attribute name="syntax">
-                <data type="string"/>
-              </attribute>
-              <optional>
-                <attribute name="name">
-                  <data type="string"/>
-                </attribute>
-              </optional>
-              <zeroOrMore>
-                <choice>
-                  <ref name="marc"/>
-                  <ref name="xslt"/>
-                </choice>
-              </zeroOrMore>
-            </element>
-          </optional>
-        </element>
-      </oneOrMore>
-    </element>
-  </define>
-</grammar>
diff --git a/xml/schema/retrievalinfo.xsd b/xml/schema/retrievalinfo.xsd
deleted file mode 100644
index 56a4632..0000000
--- a/xml/schema/retrievalinfo.xsd
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Metaproxy XML config file schemas
-  
-    Copyright (C) 2005-2011 Index Data.
-  
-    See the LICENSE file for details
-  
-  
-  The RelaxNG Compact Syntax file 'retrievalinfo.rnc' is the master copy.
-  
-  The RelaxNG XML Syntax and XML Schema are generated using 'trang':
-  trang retrievalinfo.rnc retrievalinfo.rng 
-  trang retrievalinfo.rnc retrievalinfo.xsd 
-  
-  Config file validation is done using 'xmllint':
-  xmllint -/-relaxng retrievalinfo.rng retrievalinfo.xml 
-  xmllint -/-schema retrievalinfo.xsd retirevalinfo.xml
-  
-  For information on RelaxNG see http://relaxng.org 
-  see also http://books.xmlschemata.org/relaxng/
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://indexdata.com/yaz" xmlns:mp="http://indexdata.com/metaproxy" xmlns:y="http://indexdata.com/yaz">
-  <xs:import schemaLocation="local.xsd"/>
-  <xs:import namespace="http://indexdata.com/metaproxy" schemaLocation="metaproxy.xsd"/>
-  <!--
-    need to be in different namespace then metaproxy, otherwise 
-    xslt element definition clashes in XML Schema files
-    namespace y = "http://indexdata.com/metaproxy"
-  -->
-  <xs:element name="marc">
-    <xs:complexType>
-      <xs:attribute name="inputformat" use="required" type="xs:string"/>
-      <xs:attribute name="outputformat" use="required" type="xs:string"/>
-      <xs:attribute name="inputcharset" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="xslt">
-    <xs:complexType>
-      <xs:attribute name="stylesheet" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="retrievalinfo" substitutionGroup="filter_record_transform"/>
-  <xs:element name="retrieval">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="y:backend"/>
-      </xs:sequence>
-      <xs:attribute name="syntax" use="required" type="xs:string"/>
-      <xs:attribute name="name" type="xs:string"/>
-      <xs:attribute name="identifier" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="backend">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="y:marc"/>
-        <xs:element ref="y:xslt"/>
-      </xs:choice>
-      <xs:attribute name="syntax" use="required" type="xs:string"/>
-      <xs:attribute name="name" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
-- 
1.7.10.4