Doc: module ref entries include RelagNG schema

In other words.. schema for each module is included in man page for
each module.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 996be26..31d6566 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,6 +12,7 @@ XMLMAN = metaproxy.xml \
        auth_simple.xml \
        backend_test.xml \
        bounce.xml \
+       cgi.xml \
         cql_rpn.xml \
        frontend_net.xml \
        http_file.xml \
@@ -32,6 +33,7 @@ MANFILES = metaproxy.1 \
        auth_simple.3mp \
        backend_test.3mp  \
        bounce.3mp \
+       cgi.3mp \
         cql_rpn.3mp \
         frontend_net.3mp \
        http_file.3mp \
@@ -93,7 +95,7 @@ metaproxyj.pdf: $(XMLFILES) multi.pdf
 manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl $(srcdir)/copyright.xml
        rm -f manref.xml
        for i in $(XMLMAN); do \
-               xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
+               xsltproc --xinclude $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
        done
 
 

diff --git a/doc/auth_simple.xml b/doc/auth_simple.xml
index 72d214a..6ea6881 100644 (file)
--- a/doc/auth_simple.xml
+++ b/doc/auth_simple.xml
@@ -30,9 +30,15 @@
    is rejected unless username and passsword are supplied, and match
    a pair in the register.
   </para>
-  <para>
-   ### discuss authorization phase
-  </para>
+  <!-- TODO: discuss authorization phase -->
+ </refsect1>
+
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_auth_simple.rnc"
+                    xi:parse="text"
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
  </refsect1>
  
  <refsect1><title>EXAMPLES</title>
@@ -44,10 +50,10 @@
      <targetRegister>../etc/example.target-auth</targetRegister>
      <discardUnauthorisedTargets/>
     </filter>
-]]>
+    ]]>
    </screen>
-   ### Show and describe example.target-auth
   </para>
+  <!-- Show and describe example.target-auth -->
  </refsect1> 
  
  <refsect1><title>SEE ALSO</title>

diff --git a/doc/backend_test.xml b/doc/backend_test.xml
index 9417693..1b3de80 100644 (file)
--- a/doc/backend_test.xml
+++ b/doc/backend_test.xml
@@ -28,6 +28,14 @@
   </para>
  </refsect1>
 
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_backend_test.rnc"
+                    xi:parse="text"
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/bounce.xml b/doc/bounce.xml
index 5c88286..57f5a66 100644 (file)
--- a/doc/bounce.xml
+++ b/doc/bounce.xml
@@ -34,6 +34,14 @@
   </para>
  </refsect1>
 
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_bounce.rnc"
+                    xi:parse="text"
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/cgi.xml b/doc/cgi.xml
new file mode 100644 (file)
index 0000000..f8c3cdf
--- /dev/null
+++ b/doc/cgi.xml
@@ -0,0 +1,75 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" 
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+ <!ENTITY copyright SYSTEM "copyright.xml">
+ <!ENTITY % idcommon SYSTEM "common/common.ent">
+     %idcommon;
+]>
+<refentry id="ref-cgi">
+ <refentryinfo>
+  <productname>Metaproxy</productname>
+  <info><orgname>Index Data</orgname></info>
+ </refentryinfo>
+
+ <refmeta>
+  <refentrytitle>cgi</refentrytitle>
+  <manvolnum>3mp</manvolnum>
+   <refmiscinfo class="manual">Metaproxy Module</refmiscinfo>
+ </refmeta>
+ 
+ <refnamediv>
+  <refname>cgi</refname>
+  <refpurpose>Metaproxy Package CGI Module</refpurpose>
+ </refnamediv>
+ 
+ <refsect1><title>DESCRIPTION</title>
+  <para>
+   CGI Common Gateway Interface module. 
+  </para>
+
+ </refsect1>
+
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_cgi.rnc" xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
+ <refsect1><title>EXAMPLES</title>
+  <para>
+   A typical configuration looks like this:
+   <screen><![CDATA[
+      <filter type="cgi">
+         <map path="/mycgi" exec="./cgi.sh"/>
+      </filter>
+]]>
+   </screen>
+  </para>
+ </refsect1> 
+ 
+ <refsect1><title>SEE ALSO</title>
+  <para>
+   <citerefentry>
+    <refentrytitle>metaproxy</refentrytitle>
+    <manvolnum>1</manvolnum>
+   </citerefentry>
+  </para>
+ </refsect1>
+ 
+ &copyright;
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-local-catalogs: nil
+sgml-namecase-general:t
+End:
+-->

diff --git a/doc/cql_rpn.xml b/doc/cql_rpn.xml
index d11eb2e..f60c0a6 100644 (file)
--- a/doc/cql_rpn.xml
+++ b/doc/cql_rpn.xml
@@ -52,6 +52,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_cql_rpn.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/frontend_net.xml b/doc/frontend_net.xml
index 9b0eb9e..702de7c 100644 (file)
--- a/doc/frontend_net.xml
+++ b/doc/frontend_net.xml
@@ -53,6 +53,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_frontend_net.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/http_file.xml b/doc/http_file.xml
index bbeb755..b12a4c0 100644 (file)
--- a/doc/http_file.xml
+++ b/doc/http_file.xml
@@ -30,6 +30,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_http_file.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/limit.xml b/doc/limit.xml
index 8f55b88..dd48d4b 100644 (file)
--- a/doc/limit.xml
+++ b/doc/limit.xml
@@ -33,6 +33,14 @@
   </para>
  </refsect1>
 
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_limit.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    Configuration:

diff --git a/doc/load_balance.xml b/doc/load_balance.xml
index 51868b8..fd8867e 100644 (file)
--- a/doc/load_balance.xml
+++ b/doc/load_balance.xml
@@ -34,6 +34,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_load_balance.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    This configuration offers one database, <literal>Default</literal>,

diff --git a/doc/log.xml b/doc/log.xml
index adf27ab..86e6b0d 100644 (file)
--- a/doc/log.xml
+++ b/doc/log.xml
@@ -286,6 +286,13 @@
   </para>
   
  </refsect1>
+
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_log.rnc" xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
  
  <refsect1><title>EXAMPLES</title>
   <para>

diff --git a/doc/metaproxy.xml b/doc/metaproxy.xml
index f37b564..780f8ed 100644 (file)
--- a/doc/metaproxy.xml
+++ b/doc/metaproxy.xml
@@ -208,6 +208,14 @@
    </para>
  </refsect1> 
 
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/metaproxy.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>FILES</title>
   <para>
    None important.

diff --git a/doc/multi.xml b/doc/multi.xml
index 15546cc..091862d 100644 (file)
--- a/doc/multi.xml
+++ b/doc/multi.xml
@@ -47,6 +47,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_multi.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/query_rewrite.xml b/doc/query_rewrite.xml
index 7c23948..4148668 100644 (file)
--- a/doc/query_rewrite.xml
+++ b/doc/query_rewrite.xml
@@ -41,6 +41,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_query_rewrite.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/record_transform.xml b/doc/record_transform.xml
index 4a40d7c..6465b42 100644 (file)
--- a/doc/record_transform.xml
+++ b/doc/record_transform.xml
@@ -51,6 +51,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_record_transform.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/session_shared.xml b/doc/session_shared.xml
index 7a56ead..e903343 100644 (file)
--- a/doc/session_shared.xml
+++ b/doc/session_shared.xml
@@ -84,6 +84,14 @@
   </para>
  </refsect1>
 
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_session_shared.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    Configuration:

diff --git a/doc/sru_z3950.xml b/doc/sru_z3950.xml
index 334b660..3fef9a3 100644 (file)
--- a/doc/sru_z3950.xml
+++ b/doc/sru_z3950.xml
@@ -86,6 +86,14 @@
   </para>
  </refsect1>
 
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_sru_z3950.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/doc/virt_db.xml b/doc/virt_db.xml
index 10b796a..d662688 100644 (file)
--- a/doc/virt_db.xml
+++ b/doc/virt_db.xml
@@ -66,6 +66,13 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_virt_db.rnc" xi:parse="text"
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    Consider this virt_db configuration:

diff --git a/doc/z3950_client.xml b/doc/z3950_client.xml
index 2c29028..0166e4e 100644 (file)
--- a/doc/z3950_client.xml
+++ b/doc/z3950_client.xml
@@ -69,6 +69,14 @@
   </para>
  </refsect1>
  
+ <refsect1><title>SCHEMA</title>
+   <literallayout><xi:include
+                    xi:href="../xml/schema/filter_z3950_client.rnc"
+                    xi:parse="text"  
+                    xmlns:xi="http://www.w3.org/2001/XInclude" />
+   </literallayout>
+ </refsect1>
+ 
  <refsect1><title>EXAMPLES</title>
   <para>
    A typical configuration looks like this:

diff --git a/xml/schema/Makefile.am b/xml/schema/Makefile.am
index b58960f..3fbd9a5 100644 (file)
--- a/xml/schema/Makefile.am
+++ b/xml/schema/Makefile.am
@@ -4,80 +4,76 @@ TRANG=trang
 
 xmlschemadatadir = $(pkgdatadir)/xml/schema
 
-schemas =  \
-filter_auth_simple.rnc \
-filter_auth_simple.rng \
+xsd = \
 filter_auth_simple.xsd \
-filter_backend_test.rnc \
-filter_backend_test.rng \
 filter_backend_test.xsd \
-filter_bounce.rnc \
-filter_bounce.rng \
 filter_bounce.xsd \
-filter_cgi.rnc \
-filter_cgi.rng \
 filter_cgi.xsd \
-filter_cql_rpn.rnc \
-filter_cql_rpn.rng \
 filter_cql_rpn.xsd \
-filter_frontend_net.rnc \
-filter_frontend_net.rng \
 filter_frontend_net.xsd \
-filter_http_file.rnc \
-filter_http_file.rng \
 filter_http_file.xsd \
-filter_limit.rnc \
-filter_limit.rng \
 filter_limit.xsd \
-filter_load_balance.rnc \
-filter_load_balance.rng \
 filter_load_balance.xsd \
-filter_log.rnc \
-filter_log.rng \
 filter_log.xsd \
-filter_multi.rnc \
-filter_multi.rng \
 filter_multi.xsd \
-filter_query_rewrite.rnc \
-filter_query_rewrite.rng \
 filter_query_rewrite.xsd \
-filter_record_transform.rnc \
-filter_record_transform.rng \
 filter_record_transform.xsd \
-filter_session_shared.rnc \
-filter_session_shared.rng \
 filter_session_shared.xsd \
-filter_sru_z3950.rnc \
-filter_sru_z3950.rng \
 filter_sru_z3950.xsd \
-filter_virt_db.rnc \
-filter_virt_db.rng \
 filter_virt_db.xsd \
-filter_z3950_client.rnc \
-filter_z3950_client.rng \
 filter_z3950_client.xsd \
 local.xsd \
-metaproxy.rnc \
-metaproxy.rng \
 metaproxy.xsd \
-retrievalinfo.rnc \
-retrievalinfo.rng \
 retrievalinfo.xsd
 
-xmlschemadata_DATA = $(schemas)
-
-EXTRA_DIST = $(xmlschemadata_DATA)
+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 \
+metaproxy.rng \
+retrievalinfo.rng
 
-# pattern compile RelaxNG Compact to RelaxNG XML
-.rnc.rng:
-       $(TRANG) $< $@  
+rnc =  \
+filter_auth_simple.rnc \
+filter_backend_test.rnc \
+filter_bounce.rnc \
+filter_cgi.rnc \
+filter_cql_rpn.rnc \
+filter_frontend_net.rnc \
+filter_http_file.rnc \
+filter_limit.rnc \
+filter_load_balance.rnc \
+filter_log.rnc \
+filter_multi.rnc \
+filter_query_rewrite.rnc \
+filter_record_transform.rnc \
+filter_session_shared.rnc \
+filter_sru_z3950.rnc \
+filter_virt_db.rnc \
+filter_z3950_client.rnc \
+metaproxy.rnc \
+retrievalinfo.rnc
 
-# pattern compile RelaxNG Compact to XML Schema
-.rnc.xsd:
-       $(TRANG) $< $@  
+xmlschemadata_DATA = $(xsd) $(rng) $(rnc)
 
+EXTRA_DIST = $(xmlschemadata_DATA)
 
-# needed to get dependencies correct
-metaproxy.rng:metaproxy.rnc retrievalinfo.rnc
+$(rng):$(rnc)
+       $(TRANG) metaproxy.rnc metaproxy.rng
 
-metaproxy.xsd:metaproxy.rnc retrievalinfo.rnc
+$(xsd):$(rnc)
+       $(TRANG) metaproxy.rnc metaproxy.xsd

diff --git a/xml/schema/filter_auth_simple.rnc b/xml/schema/filter_auth_simple.rnc
index f94fa04..05d0a69 100644 (file)
--- a/xml/schema/filter_auth_simple.rnc
+++ b/xml/schema/filter_auth_simple.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 
@@ -27,4 +9,3 @@ filter_auth_simple =
   element mp:userRegister { xsd:string }?,
   element mp:targetRegister { xsd:string }?,
   element mp:discardUnauthorisedTargets { empty }?
- 

diff --git a/xml/schema/filter_auth_simple.rng b/xml/schema/filter_auth_simple.rng
index f6921da..1cc92d0 100644 (file)
--- a/xml/schema/filter_auth_simple.rng
+++ b/xml/schema/filter_auth_simple.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_auth_simple.xsd b/xml/schema/filter_auth_simple.xsd
index 2fe796c..c2eda0e 100644 (file)
--- a/xml/schema/filter_auth_simple.xsd
+++ b/xml/schema/filter_auth_simple.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_backend_test.rnc b/xml/schema/filter_backend_test.rnc
index 6172b12..aa13253 100644 (file)
--- a/xml/schema/filter_backend_test.rnc
+++ b/xml/schema/filter_backend_test.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_backend_test.rng b/xml/schema/filter_backend_test.rng
index 5b6429d..0e71c96 100644 (file)
--- a/xml/schema/filter_backend_test.rng
+++ b/xml/schema/filter_backend_test.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_backend_test.xsd b/xml/schema/filter_backend_test.xsd
index d11530c..e43bad7 100644 (file)
--- a/xml/schema/filter_backend_test.xsd
+++ b/xml/schema/filter_backend_test.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_bounce.rnc b/xml/schema/filter_bounce.rnc
index 752c8a9..6715406 100644 (file)
--- a/xml/schema/filter_bounce.rnc
+++ b/xml/schema/filter_bounce.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_bounce.rng b/xml/schema/filter_bounce.rng
index 847935d..b1b92c9 100644 (file)
--- a/xml/schema/filter_bounce.rng
+++ b/xml/schema/filter_bounce.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_bounce.xsd b/xml/schema/filter_bounce.xsd
index e338e64..f828a72 100644 (file)
--- a/xml/schema/filter_bounce.xsd
+++ b/xml/schema/filter_bounce.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_cgi.rnc b/xml/schema/filter_cgi.rnc
index 259c416..6ace903 100644 (file)
--- a/xml/schema/filter_cgi.rnc
+++ b/xml/schema/filter_cgi.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_cgi.rng b/xml/schema/filter_cgi.rng
index ba39880..7a7ab31 100644 (file)
--- a/xml/schema/filter_cgi.rng
+++ b/xml/schema/filter_cgi.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_cgi.xsd b/xml/schema/filter_cgi.xsd
index 4807a7b..a01e4e5 100644 (file)
--- a/xml/schema/filter_cgi.xsd
+++ b/xml/schema/filter_cgi.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_cql_rpn.rnc b/xml/schema/filter_cql_rpn.rnc
index f109e69..17c388e 100644 (file)
--- a/xml/schema/filter_cql_rpn.rnc
+++ b/xml/schema/filter_cql_rpn.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_cql_rpn.rng b/xml/schema/filter_cql_rpn.rng
index 1fbb8bd..992d137 100644 (file)
--- a/xml/schema/filter_cql_rpn.rng
+++ b/xml/schema/filter_cql_rpn.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_cql_rpn.xsd b/xml/schema/filter_cql_rpn.xsd
index cc813c4..8446a74 100644 (file)
--- a/xml/schema/filter_cql_rpn.xsd
+++ b/xml/schema/filter_cql_rpn.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_frontend_net.rnc b/xml/schema/filter_frontend_net.rnc
index f7fc90c..0c89249 100644 (file)
--- a/xml/schema/filter_frontend_net.rnc
+++ b/xml/schema/filter_frontend_net.rnc
@@ -1,22 +1,4 @@
 # 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/
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_frontend_net.rng b/xml/schema/filter_frontend_net.rng
index 9f91376..1dc170f 100644 (file)
--- a/xml/schema/filter_frontend_net.rng
+++ b/xml/schema/filter_frontend_net.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_frontend_net.xsd b/xml/schema/filter_frontend_net.xsd
index de07958..faf67b6 100644 (file)
--- a/xml/schema/filter_frontend_net.xsd
+++ b/xml/schema/filter_frontend_net.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_http_file.rnc b/xml/schema/filter_http_file.rnc
index 386cd9e..32a689f 100644 (file)
--- a/xml/schema/filter_http_file.rnc
+++ b/xml/schema/filter_http_file.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_http_file.rng b/xml/schema/filter_http_file.rng
index 76c12ce..607a83a 100644 (file)
--- a/xml/schema/filter_http_file.rng
+++ b/xml/schema/filter_http_file.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_http_file.xsd b/xml/schema/filter_http_file.xsd
index c5186a4..33940ff 100644 (file)
--- a/xml/schema/filter_http_file.xsd
+++ b/xml/schema/filter_http_file.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_limit.rnc b/xml/schema/filter_limit.rnc
index 1ea375f..36e7bf5 100644 (file)
--- a/xml/schema/filter_limit.rnc
+++ b/xml/schema/filter_limit.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_limit.rng b/xml/schema/filter_limit.rng
index 517fec9..8932450 100644 (file)
--- a/xml/schema/filter_limit.rng
+++ b/xml/schema/filter_limit.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_limit.xsd b/xml/schema/filter_limit.xsd
index f1b7432..a051687 100644 (file)
--- a/xml/schema/filter_limit.xsd
+++ b/xml/schema/filter_limit.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_multi.rnc b/xml/schema/filter_multi.rnc
index e2e8396..c094177 100644 (file)
--- a/xml/schema/filter_multi.rnc
+++ b/xml/schema/filter_multi.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_multi.rng b/xml/schema/filter_multi.rng
index e5c2ea7..d0d4b00 100644 (file)
--- a/xml/schema/filter_multi.rng
+++ b/xml/schema/filter_multi.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_multi.xsd b/xml/schema/filter_multi.xsd
index 28e6e9f..0ad68d9 100644 (file)
--- a/xml/schema/filter_multi.xsd
+++ b/xml/schema/filter_multi.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_query_rewrite.rnc b/xml/schema/filter_query_rewrite.rnc
index 8db3bdd..2d91d24 100644 (file)
--- a/xml/schema/filter_query_rewrite.rnc
+++ b/xml/schema/filter_query_rewrite.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_query_rewrite.rng b/xml/schema/filter_query_rewrite.rng
index f48798e..a64c4de 100644 (file)
--- a/xml/schema/filter_query_rewrite.rng
+++ b/xml/schema/filter_query_rewrite.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_query_rewrite.xsd b/xml/schema/filter_query_rewrite.xsd
index 58c0910..f1d95e6 100644 (file)
--- a/xml/schema/filter_query_rewrite.xsd
+++ b/xml/schema/filter_query_rewrite.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_record_transform.rnc b/xml/schema/filter_record_transform.rnc
index 518352a..4633a78 100644 (file)
--- a/xml/schema/filter_record_transform.rnc
+++ b/xml/schema/filter_record_transform.rnc
@@ -1,25 +1,9 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 
+include "retrievalinfo.rnc"
+
 filter_record_transform =
   attribute type { "record_transform" },
   attribute id { xsd:NCName }?,

diff --git a/xml/schema/filter_record_transform.rng b/xml/schema/filter_record_transform.rng
index 97a3e89..a31b397 100644 (file)
--- a/xml/schema/filter_record_transform.rng
+++ b/xml/schema/filter_record_transform.rng
@@ -1,26 +1,7 @@
 <?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/
--->
+<!-- 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>

diff --git a/xml/schema/filter_record_transform.xsd b/xml/schema/filter_record_transform.xsd
index 418db23..9ac6160 100644 (file)
--- a/xml/schema/filter_record_transform.xsd
+++ b/xml/schema/filter_record_transform.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_session_shared.rnc b/xml/schema/filter_session_shared.rnc
index a476008..e5a295f 100644 (file)
--- a/xml/schema/filter_session_shared.rnc
+++ b/xml/schema/filter_session_shared.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_session_shared.rng b/xml/schema/filter_session_shared.rng
index be70a93..8507bad 100644 (file)
--- a/xml/schema/filter_session_shared.rng
+++ b/xml/schema/filter_session_shared.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_session_shared.xsd b/xml/schema/filter_session_shared.xsd
index b649ca1..5ad9d2f 100644 (file)
--- a/xml/schema/filter_session_shared.xsd
+++ b/xml/schema/filter_session_shared.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_sru_z3950.rnc b/xml/schema/filter_sru_z3950.rnc
index 65a54f8..bd1d24a 100644 (file)
--- a/xml/schema/filter_sru_z3950.rnc
+++ b/xml/schema/filter_sru_z3950.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_sru_z3950.rng b/xml/schema/filter_sru_z3950.rng
index 809425b..e9b901d 100644 (file)
--- a/xml/schema/filter_sru_z3950.rng
+++ b/xml/schema/filter_sru_z3950.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_sru_z3950.xsd b/xml/schema/filter_sru_z3950.xsd
index beaf752..e23460d 100644 (file)
--- a/xml/schema/filter_sru_z3950.xsd
+++ b/xml/schema/filter_sru_z3950.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_virt_db.rnc b/xml/schema/filter_virt_db.rnc
index 58a4727..8e040f4 100644 (file)
--- a/xml/schema/filter_virt_db.rnc
+++ b/xml/schema/filter_virt_db.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_virt_db.rng b/xml/schema/filter_virt_db.rng
index 8c3a338..cbca66a 100644 (file)
--- a/xml/schema/filter_virt_db.rng
+++ b/xml/schema/filter_virt_db.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_virt_db.xsd b/xml/schema/filter_virt_db.xsd
index a7d329f..ee610a9 100644 (file)
--- a/xml/schema/filter_virt_db.xsd
+++ b/xml/schema/filter_virt_db.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/filter_z3950_client.rnc b/xml/schema/filter_z3950_client.rnc
index 1d7d34c..34dab61 100644 (file)
--- a/xml/schema/filter_z3950_client.rnc
+++ b/xml/schema/filter_z3950_client.rnc
@@ -1,22 +1,4 @@
-# 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/
+# Metaproxy XML config file schema
 
 namespace mp = "http://indexdata.com/metaproxy"
 

diff --git a/xml/schema/filter_z3950_client.rng b/xml/schema/filter_z3950_client.rng
index 3a1f6ee..b7f33db 100644 (file)
--- a/xml/schema/filter_z3950_client.rng
+++ b/xml/schema/filter_z3950_client.rng
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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">

diff --git a/xml/schema/filter_z3950_client.xsd b/xml/schema/filter_z3950_client.xsd
index a60934b..3ccba0f 100644 (file)
--- a/xml/schema/filter_z3950_client.xsd
+++ b/xml/schema/filter_z3950_client.xsd
@@ -1,25 +1,5 @@
 <?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/
--->
+<!-- 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"/>

diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 14295ad..983b1cf 100644 (file)
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -22,7 +22,6 @@ namespace mp = "http://indexdata.com/metaproxy"
 
 start |= metaproxy
 
-include "retrievalinfo.rnc"
 include "filter_auth_simple.rnc"
 include "filter_backend_test.rnc"
 include "filter_bounce.rnc"

diff --git a/xml/schema/metaproxy.rng b/xml/schema/metaproxy.rng
index a5668fc..00b42a3 100644 (file)
--- a/xml/schema/metaproxy.rng
+++ b/xml/schema/metaproxy.rng
@@ -24,7 +24,6 @@
   <start combine="choice">
     <ref name="metaproxy"/>
   </start>
-  <include href="retrievalinfo.rng"/>
   <include href="filter_auth_simple.rng"/>
   <include href="filter_backend_test.rng"/>
   <include href="filter_bounce.rng"/>