Back out excessively fancy RelaxNG, per previous log message

svn path=/rpkid/left-right-protocol-samples.xml; revision=1813

14 files changed, 21 insertions, 184 deletions

diff --git a/rpkid/left-right-protocol-samples.xml b/rpkid/left-right-protocol-samples.xml
index d001fb03..b7af5830 100644
--- a/rpkid/left-right-protocol-samples.xml
+++ b/rpkid/left-right-protocol-samples.xml
@@ -1249,20 +1249,6 @@
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
 	<report_error self_id="42" error_code="your_hair_is_on_fire">text string</report_error>
     </msg>
-    
-    <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<report_error self_id="42" error_code="your_hair_is_on_fire"><bag_of_data foo="bar"/></report_error>
-    </msg>
-    
-    <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<report_error self_id="42" error_code="your_hair_is_on_fire">
-	    <fee>
-		<fie>
-		    <foe>fum</foe>
-		</fie>
-	    </fee>
-	</report_error>
-    </msg>
 
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
 	<report_error self_id="42" error_code="your_hair_is_on_fire"/>
diff --git a/rpkid/left-right-protocol-samples/pdu.064.xml b/rpkid/left-right-protocol-samples/pdu.064.xml
index ece8a938..65707abd 100644
--- a/rpkid/left-right-protocol-samples/pdu.064.xml
+++ b/rpkid/left-right-protocol-samples/pdu.064.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="reply">
-  <report_error self_id="42" error_code="your_hair_is_on_fire">
-    <bag_of_data foo="bar"/>
-  </report_error>
+  <report_error self_id="42" error_code="your_hair_is_on_fire"/>
 </msg>
diff --git a/rpkid/left-right-protocol-samples/pdu.065.xml b/rpkid/left-right-protocol-samples/pdu.065.xml
deleted file mode 100644
index d5f73200..00000000
--- a/rpkid/left-right-protocol-samples/pdu.065.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--Automatically generated, do not edit.-->
-<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="reply">
-  <report_error self_id="42" error_code="your_hair_is_on_fire">
-    <fee>
-      <fie>
-        <foe>fum</foe>
-      </fie>
-    </fee>
-  </report_error>
-</msg>
diff --git a/rpkid/left-right-protocol-samples/pdu.066.xml b/rpkid/left-right-protocol-samples/pdu.066.xml
deleted file mode 100644
index 65707abd..00000000
--- a/rpkid/left-right-protocol-samples/pdu.066.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--Automatically generated, do not edit.-->
-<msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1" type="reply">
-  <report_error self_id="42" error_code="your_hair_is_on_fire"/>
-</msg>
diff --git a/rpkid/left-right-schema.rnc b/rpkid/left-right-schema.rnc
index b38abe03..f24dbb90 100644
--- a/rpkid/left-right-schema.rnc
+++ b/rpkid/left-right-schema.rnc
@@ -228,12 +228,10 @@ list_resources_reply = element list_resources {
 
 error = xsd:token { maxLength="1024" }
 
-any = element * { attribute * { text }*, ( text | any* ) }
-
 report_error_reply = element report_error {
   tag, self_id,
   attribute error_code { error },
-  ( text | any* )?
+  xsd:string { maxLength="512000" }?
 }
 
 # Local Variables:
diff --git a/rpkid/left-right-schema.rng b/rpkid/left-right-schema.rng
index 9339a8c0..2ce6f474 100644
--- a/rpkid/left-right-schema.rng
+++ b/rpkid/left-right-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right-schema.rnc 1806 2008-05-21 03:28:07Z sra $
+  $Id: left-right-schema.rnc 1812 2008-05-22 17:14:18Z sra $
   
   RelaxNG Schema for RPKI left-right protocol.
   
@@ -932,22 +932,6 @@
       <param name="maxLength">1024</param>
     </data>
   </define>
-  <define name="any">
-    <element>
-      <anyName/>
-      <zeroOrMore>
-        <attribute>
-          <anyName/>
-        </attribute>
-      </zeroOrMore>
-      <choice>
-        <text/>
-        <zeroOrMore>
-          <ref name="any"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
   <define name="report_error_reply">
     <element name="report_error">
       <ref name="tag"/>
@@ -956,12 +940,9 @@
         <ref name="error"/>
       </attribute>
       <optional>
-        <choice>
-          <text/>
-          <zeroOrMore>
-            <ref name="any"/>
-          </zeroOrMore>
-        </choice>
+        <data type="string">
+          <param name="maxLength">512000</param>
+        </data>
       </optional>
     </element>
   </define>
diff --git a/rpkid/publication-protocol-samples.xml b/rpkid/publication-protocol-samples.xml
index 2aecf0c2..79d496f0 100644
--- a/rpkid/publication-protocol-samples.xml
+++ b/rpkid/publication-protocol-samples.xml
@@ -143,7 +143,7 @@
     </msg>
     
     <!-- === -->
-    
+
     <!-- === -->
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/publication-spec/">
@@ -151,29 +151,6 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/publication-spec/">
-	<report_error error_code="your_hair_is_on_fire"><bag_of_data foo="bar"/></report_error>
-    </msg>
-    
-    <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/publication-spec/">
-	<report_error error_code="your_hair_is_on_fire">
-	    <fee>
-		<fie>
-		    <foe>fum</foe>
-		</fie>
-	    </fee>
-	</report_error>
-    </msg>
-    
-    <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/publication-spec/">
-	<report_error error_code="your_hair_is_on_fire">
-	    <fee arg="fee"/>
-	    <fie>
-		<foe>fum</foe>
-	    </fie>
-	</report_error>
-    </msg>
-    
-    <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/publication-spec/">
 	<report_error error_code="your_hair_is_on_fire"/>
     </msg>
     
diff --git a/rpkid/publication-protocol-samples/pdu.012.xml b/rpkid/publication-protocol-samples/pdu.012.xml
index 6883c596..3e9f8c77 100644
--- a/rpkid/publication-protocol-samples/pdu.012.xml
+++ b/rpkid/publication-protocol-samples/pdu.012.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/publication-spec/" version="1" type="reply">
-  <report_error error_code="your_hair_is_on_fire">
-    <bag_of_data foo="bar"/>
-  </report_error>
+  <report_error error_code="your_hair_is_on_fire"/>
 </msg>
diff --git a/rpkid/publication-protocol-samples/pdu.013.xml b/rpkid/publication-protocol-samples/pdu.013.xml
deleted file mode 100644
index 1b524d42..00000000
--- a/rpkid/publication-protocol-samples/pdu.013.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--Automatically generated, do not edit.-->
-<msg xmlns="http://www.hactrn.net/uris/rpki/publication-spec/" version="1" type="reply">
-  <report_error error_code="your_hair_is_on_fire">
-    <fee>
-      <fie>
-        <foe>fum</foe>
-      </fie>
-    </fee>
-  </report_error>
-</msg>
diff --git a/rpkid/publication-protocol-samples/pdu.014.xml b/rpkid/publication-protocol-samples/pdu.014.xml
deleted file mode 100644
index b5114e97..00000000
--- a/rpkid/publication-protocol-samples/pdu.014.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--Automatically generated, do not edit.-->
-<msg xmlns="http://www.hactrn.net/uris/rpki/publication-spec/" version="1" type="reply">
-  <report_error error_code="your_hair_is_on_fire">
-    <fee arg="fee"/>
-    <fie>
-      <foe>fum</foe>
-    </fie>
-  </report_error>
-</msg>
diff --git a/rpkid/publication-protocol-samples/pdu.015.xml b/rpkid/publication-protocol-samples/pdu.015.xml
deleted file mode 100644
index 3e9f8c77..00000000
--- a/rpkid/publication-protocol-samples/pdu.015.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--Automatically generated, do not edit.-->
-<msg xmlns="http://www.hactrn.net/uris/rpki/publication-spec/" version="1" type="reply">
-  <report_error error_code="your_hair_is_on_fire"/>
-</msg>
diff --git a/rpkid/publication-schema.rnc b/rpkid/publication-schema.rnc
index 98ac6eda..e2dee26f 100644
--- a/rpkid/publication-schema.rnc
+++ b/rpkid/publication-schema.rnc
@@ -92,12 +92,10 @@ roa_reply |= element roa { attribute action { "withdraw" }, tag?, client_id?, ur
 
 error = xsd:token { maxLength="1024" }
 
-any = element * { attribute * { text }*, ( text | any* ) }
-
 report_error_reply = element report_error {
   tag?,
   attribute error_code { error },
-  ( text | any* )?
+  xsd:string { maxLength="512000" }?
 }
 
 # Local Variables:
diff --git a/rpkid/publication-schema.rng b/rpkid/publication-schema.rng
index a73440ba..3a7e81ea 100644
--- a/rpkid/publication-schema.rng
+++ b/rpkid/publication-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: publication-schema.rnc 1811 2008-05-22 16:39:41Z sra $
+  $Id: publication-schema.rnc 1812 2008-05-22 17:14:18Z sra $
   
   RelaxNG Schema for RPKI publication protocol.
   
@@ -590,22 +590,6 @@
       <param name="maxLength">1024</param>
     </data>
   </define>
-  <define name="any">
-    <element>
-      <anyName/>
-      <zeroOrMore>
-        <attribute>
-          <anyName/>
-        </attribute>
-      </zeroOrMore>
-      <choice>
-        <text/>
-        <zeroOrMore>
-          <ref name="any"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
   <define name="report_error_reply">
     <element name="report_error">
       <optional>
@@ -615,12 +599,9 @@
         <ref name="error"/>
       </attribute>
       <optional>
-        <choice>
-          <text/>
-          <zeroOrMore>
-            <ref name="any"/>
-          </zeroOrMore>
-        </choice>
+        <data type="string">
+          <param name="maxLength">512000</param>
+        </data>
       </optional>
     </element>
   </define>
diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py
index 38a8d0c0..26818db0 100644
--- a/rpkid/rpki/relaxng.py
+++ b/rpkid/rpki/relaxng.py
@@ -6,7 +6,7 @@ import lxml.etree
 ## Parsed RelaxNG left_right schema
 left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right-schema.rnc 1806 2008-05-21 03:28:07Z sra $
+  $Id: left-right-schema.rnc 1812 2008-05-22 17:14:18Z sra $
   
   RelaxNG Schema for RPKI left-right protocol.
   
@@ -938,22 +938,6 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       <param name="maxLength">1024</param>
     </data>
   </define>
-  <define name="any">
-    <element>
-      <anyName/>
-      <zeroOrMore>
-        <attribute>
-          <anyName/>
-        </attribute>
-      </zeroOrMore>
-      <choice>
-        <text/>
-        <zeroOrMore>
-          <ref name="any"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
   <define name="report_error_reply">
     <element name="report_error">
       <ref name="tag"/>
@@ -962,12 +946,9 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
         <ref name="error"/>
       </attribute>
       <optional>
-        <choice>
-          <text/>
-          <zeroOrMore>
-            <ref name="any"/>
-          </zeroOrMore>
-        </choice>
+        <data type="string">
+          <param name="maxLength">512000</param>
+        </data>
       </optional>
     </element>
   </define>
@@ -1237,7 +1218,7 @@ up_down = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encodi
 ## Parsed RelaxNG publication schema
 publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: publication-schema.rnc 1811 2008-05-22 16:39:41Z sra $
+  $Id: publication-schema.rnc 1812 2008-05-22 17:14:18Z sra $
   
   RelaxNG Schema for RPKI publication protocol.
   
@@ -1827,22 +1808,6 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
       <param name="maxLength">1024</param>
     </data>
   </define>
-  <define name="any">
-    <element>
-      <anyName/>
-      <zeroOrMore>
-        <attribute>
-          <anyName/>
-        </attribute>
-      </zeroOrMore>
-      <choice>
-        <text/>
-        <zeroOrMore>
-          <ref name="any"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
   <define name="report_error_reply">
     <element name="report_error">
       <optional>
@@ -1852,12 +1817,9 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" en
         <ref name="error"/>
       </attribute>
       <optional>
-        <choice>
-          <text/>
-          <zeroOrMore>
-            <ref name="any"/>
-          </zeroOrMore>
-        </choice>
+        <data type="string">
+          <param name="maxLength">512000</param>
+        </data>
       </optional>
     </element>
   </define>