QPID-1274 - qmf-gen can now generate code from multiple schema files. Uses __file__ as a better way to locate data files. Added code generation for ACL schema.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@693523 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 0 deletions

diff --git a/cpp/managementgen/qmf/generate.py b/cpp/managementgen/qmf/generate.py
index 70735b208a..e977ce2e9d 100755
--- a/cpp/managementgen/qmf/generate.py
+++ b/cpp/managementgen/qmf/generate.py
@@ -298,3 +298,8 @@ class Generator:
     self.templateFiles.append (templateFile)
     stream = template.expand (makefile)
     self.writeIfChanged (stream, target, force)
+
+  @staticmethod
+  def getModulePath():
+    return __file__
+
diff --git a/cpp/managementgen/qmf/schema.py b/cpp/managementgen/qmf/schema.py
index e666bdbb39..9263c29543 100755
--- a/cpp/managementgen/qmf/schema.py
+++ b/cpp/managementgen/qmf/schema.py
@@ -656,6 +656,7 @@ class SchemaEvent:
     self.name   = None
     self.desc   = None
     self.args   = []
+    self.defaultSeverity = None
 
     attrs = node.attributes
     for idx in range (attrs.length):
@@ -667,6 +668,9 @@ class SchemaEvent:
       elif key == 'desc':
         self.desc = val
 
+      elif key == 'defaultSeverity':
+        self.defaultSeverity = val
+
       else:
         raise ValueError ("Unknown attribute in event '%s'" % key)