aboutsummaryrefslogtreecommitdiff
path: root/rpki
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-04-07 03:18:50 +0000
committerRob Austein <sra@hactrn.net>2014-04-07 03:18:50 +0000
commit8a54b07cc85256a8fe9132c3d0422b31f2570a1c (patch)
tree86c5713730e8e62f8914686a8cf7a48ce3921070 /rpki
parentd8eb94e6f5d7f23d1c208339052587647f60416d (diff)
Fix schema generation.
svn path=/branches/tk685/; revision=5760
Diffstat (limited to 'rpki')
-rw-r--r--rpki/relaxng.py40
-rw-r--r--rpki/sql_schemas.py4
2 files changed, 22 insertions, 22 deletions
diff --git a/rpki/relaxng.py b/rpki/relaxng.py
index 0d8c0d64..917ed6ed 100644
--- a/rpki/relaxng.py
+++ b/rpki/relaxng.py
@@ -2,11 +2,11 @@
import lxml.etree
-## @var left_right
-## Parsed RelaxNG left_right schema
-left_right = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/left_right
+## Parsed RelaxNG relaxng/left_right schema
+relaxng/left_right = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id: left-right-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+ $Id: left-right-schema.rnc 5757 2014-04-05 22:42:12Z sra $
RelaxNG schema for RPKI left-right protocol.
@@ -1095,11 +1095,11 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" en
-->
'''))
-## @var up_down
-## Parsed RelaxNG up_down schema
-up_down = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/up_down
+## Parsed RelaxNG relaxng/up_down schema
+relaxng/up_down = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id: up-down-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+ $Id: up-down-schema.rnc 5757 2014-04-05 22:42:12Z sra $
RelaxNG schema for the up-down protocol, extracted from RFC 6492.
@@ -1376,11 +1376,11 @@ up_down = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encod
-->
'''))
-## @var publication
-## Parsed RelaxNG publication schema
-publication = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/publication
+## Parsed RelaxNG relaxng/publication schema
+relaxng/publication = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id: publication-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+ $Id: publication-schema.rnc 5757 2014-04-05 22:42:12Z sra $
RelaxNG schema for RPKI publication protocol.
@@ -1954,11 +1954,11 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" e
-->
'''))
-## @var myrpki
-## Parsed RelaxNG myrpki schema
-myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/myrpki
+## Parsed RelaxNG relaxng/myrpki schema
+relaxng/myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id: myrpki.rnc 5753 2014-04-05 19:24:26Z sra $
+ $Id: myrpki.rnc 5757 2014-04-05 22:42:12Z sra $
RelaxNG schema for MyRPKI XML messages.
@@ -2337,11 +2337,11 @@ myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encodi
-->
'''))
-## @var router_certificate
-## Parsed RelaxNG router_certificate schema
-router_certificate = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/router_certificate
+## Parsed RelaxNG relaxng/router_certificate schema
+relaxng/router_certificate = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id: router-certificate-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+ $Id: router-certificate-schema.rnc 5757 2014-04-05 22:42:12Z sra $
RelaxNG schema for BGPSEC router certificate interchange format.
diff --git a/rpki/sql_schemas.py b/rpki/sql_schemas.py
index e57c7a7f..0ac6016e 100644
--- a/rpki/sql_schemas.py
+++ b/rpki/sql_schemas.py
@@ -2,7 +2,7 @@
## @var rpkid
## SQL schema rpkid
-rpkid = '''-- $Id: rpkid.sql 5753 2014-04-05 19:24:26Z sra $
+rpkid = '''-- $Id: rpkid.sql 5757 2014-04-05 22:42:12Z sra $
-- Copyright (C) 2009--2011 Internet Systems Consortium ("ISC")
--
@@ -256,7 +256,7 @@ CREATE TABLE ee_cert (
## @var pubd
## SQL schema pubd
-pubd = '''-- $Id: pubd.sql 3465 2010-10-07 00:59:39Z sra $
+pubd = '''-- $Id: pubd.sql 5757 2014-04-05 22:42:12Z sra $
-- Copyright (C) 2009--2010 Internet Systems Consortium ("ISC")
--