Pull XML namespaces and so forth from schemas where possible.

svn path=/trunk/; revision=5902

1 files changed, 5 insertions, 4 deletions

diff --git a/rpki/publication.py b/rpki/publication.py
index 95f4f314..5fc7f3dd 100644
--- a/rpki/publication.py
+++ b/rpki/publication.py
@@ -53,8 +53,8 @@ class publication_namespace(object):
   XML namespace parameters for publication protocol.
   """
 
-  xmlns = "http://www.hactrn.net/uris/rpki/publication-spec/"
-  nsmap = { None : xmlns }
+  xmlns = rpki.relaxng.publication.xmlns
+  nsmap = rpki.relaxng.publication.nsmap
 
 class control_elt(rpki.xml_utils.data_elt, rpki.sql.sql_persistent, publication_namespace):
   """
@@ -413,7 +413,7 @@ class msg(rpki.xml_utils.msg, publication_namespace):
 
   ## @var version
   # Protocol version
-  version = 1
+  version = int(rpki.relaxng.publication.version)
 
   ## @var pdus
   # Dispatch table of PDUs for this protocol.
@@ -457,7 +457,8 @@ class sax_handler(rpki.xml_utils.sax_handler):
 
   pdu = msg
   name = "msg"
-  version = "1"
+  version = rpki.relaxng.publication.version
+
 
 class cms_msg(rpki.x509.XML_CMS_object):
   """