QPID-1274 - Changed C++ namespace for generated management code. Improved efficiency of generated functions to use const references for non-simple types.

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

9 files changed, 126 insertions, 69 deletions

diff --git a/qpid/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen
index a6f022926c..523579fe6c 100755
--- a/qpid/cpp/managementgen/qmf-gen
+++ b/qpid/cpp/managementgen/qmf-gen
@@ -20,7 +20,7 @@
 #
 import sys
 import os
-from qmf.schema   import PackageSchema, SchemaClass
+from qmf.schema   import SchemaPackage, SchemaClass
 from qmf.generate import Generator
 from optparse     import OptionParser
 
@@ -52,13 +52,14 @@ if len(args) == 0:
   parser.exit()
 
 for schemafile in args:
-  schema = PackageSchema (typefile, schemafile, opts)
+  package = SchemaPackage (typefile, schemafile, opts)
 
-  gen.makeClassFiles  ("Class.h",     schema)
-  gen.makeClassFiles  ("Class.cpp",   schema)
-  gen.makeMethodFiles ("Args.h",      schema)
-  gen.makePackageFile ("Package.h",   schema)
-  gen.makePackageFile ("Package.cpp", schema)
+  gen.setPackage      (package.packageName)
+  gen.makeClassFiles  ("Class.h",     package)
+  gen.makeClassFiles  ("Class.cpp",   package)
+  gen.makeMethodFiles ("Args.h",      package)
+  gen.makePackageFile ("Package.h",   package)
+  gen.makePackageFile ("Package.cpp", package)
 
 if opts.makefile != None:
   gen.makeSingleFile ("Makefile.mk", opts.makefile, force=True)
diff --git a/qpid/cpp/managementgen/qmf/generate.py b/qpid/cpp/managementgen/qmf/generate.py
index 9050ca8ced..8b8eb43252 100755
--- a/qpid/cpp/managementgen/qmf/generate.py
+++ b/qpid/cpp/managementgen/qmf/generate.py
@@ -168,15 +168,20 @@ class Generator:
     return newpath + "/"
   
   def __init__ (self, destDir, templateDir):
-    self.dest      = self.normalize (destDir)
-    self.input     = self.normalize (templateDir)
-    self.filelists = {}
+    self.dest        = self.normalize (destDir)
+    self.input       = self.normalize (templateDir)
+    self.packagePath = self.dest
+    self.filelists   = {}
     self.filelists["h"]   = []
     self.filelists["cpp"] = []
     self.filelists["mk"]  = []
     self.templateFiles    = []
     self.variables        = {}
 
+  def setPackage (self, packageName):
+    path = "/".join(packageName.split("."))
+    self.packagePath = self.normalize(self.dest + path)
+
   def genDisclaimer (self, stream, variables):
     prefix = variables["commentPrefix"]
     stream.write (prefix + " This source file was created by a code generator.\n")
@@ -191,7 +196,7 @@ class Generator:
   def writeIfChanged (self, stream, target, force=False):
     ext = self.fileExt (target)
     self.filelists[ext].append (target)
-    tempFile = self.dest + "gen.tmp"
+    tempFile = self.packagePath + "gen.tmp"
     fd = open (tempFile, "w")
     fd.write  (stream.getvalue ())
     fd.close  ()
@@ -216,7 +221,7 @@ class Generator:
     if dot == -1:
       raise ValueError ("Invalid template file name %s" % templateFile)
     extension = templateFile[dot:len (templateFile)]
-    path = self.dest + "Package" + schema.getPackageNameCap() + extension
+    path = self.packagePath + "Package" + extension
     return path
 
   def targetClassFile (self, _class, templateFile):
@@ -224,7 +229,7 @@ class Generator:
     if dot == -1:
       raise ValueError ("Invalid template file name %s" % templateFile)
     extension = templateFile[dot:len (templateFile)]
-    path = self.dest + _class.getNameCap () + extension
+    path = self.packagePath + _class.getNameCap () + extension
     return path
 
   def targetMethodFile (self, method, templateFile):
@@ -233,7 +238,7 @@ class Generator:
     if dot == -1:
       raise ValueError ("Invalid template file name %s" % templateFile)
     extension = templateFile[dot:]
-    path = self.dest + "Args" + method.getFullName () + extension
+    path = self.packagePath + "Args" + method.getFullName () + extension
     return path
 
   def initExpansion (self):
diff --git a/qpid/cpp/managementgen/qmf/management-types.xml b/qpid/cpp/managementgen/qmf/management-types.xml
index 31337b23bc..56d2488803 100644
--- a/qpid/cpp/managementgen/qmf/management-types.xml
+++ b/qpid/cpp/managementgen/qmf/management-types.xml
@@ -19,7 +19,7 @@
   under the License.
 -->
 
-<type name="objId"     base="REF"       cpp="ObjectId"      encode="#.encode(@)"         decode="#.decode(@)"          accessor="direct" init="0"/>
+<type name="objId"     base="REF"       cpp="::qpid::management::ObjectId"  encode="#.encode(@)" decode="#.decode(@)"  accessor="direct" init="0" byRef="y"/>
 <type name="uint8"     base="U8"        cpp="uint8_t"       encode="@.putOctet(#)"       decode="# = @.getOctet()"     accessor="direct" init="0"/>
 <type name="uint16"    base="U16"       cpp="uint16_t"      encode="@.putShort(#)"       decode="# = @.getShort()"     accessor="direct" init="0"/>
 <type name="uint32"    base="U32"       cpp="uint32_t"      encode="@.putLong(#)"        decode="# = @.getLong()"      accessor="direct" init="0"/>
@@ -29,14 +29,14 @@
 <type name="int32"     base="S32"       cpp="int32_t"       encode="@.putInt32(#)"       decode="# = @.getInt32()"     accessor="direct" init="0"/>
 <type name="int64"     base="S64"       cpp="int64_t"       encode="@.putInt64(#)"       decode="# = @.getInt64()"     accessor="direct" init="0"/>
 <type name="bool"      base="BOOL"      cpp="uint8_t"       encode="@.putOctet(#?1:0)"   decode="# = @.getOctet()==1"  accessor="direct" init="0"/>
-<type name="sstr"      base="SSTR"      cpp="std::string"   encode="@.putShortString(#)" decode="@.getShortString(#)"  accessor="direct" init='""'/>
-<type name="lstr"      base="LSTR"      cpp="std::string"   encode="@.putLongString(#)"  decode="@.getLongString(#)"   accessor="direct" init='""'/>
-<type name="absTime"   base="ABSTIME"   cpp="uint64_t"      encode="@.putLongLong(#)"    decode="# = @.getLongLong()"  accessor="direct" init="0"/>
+<type name="sstr"      base="SSTR"      cpp="std::string"   encode="@.putShortString(#)" decode="@.getShortString(#)"  accessor="direct" init='""' byRef="y"/>
+<type name="lstr"      base="LSTR"      cpp="std::string"   encode="@.putLongString(#)"  decode="@.getLongString(#)"   accessor="direct" init='""' byRef="y"/>
+<type name="absTime"   base="ABSTIME"   cpp="int64_t"       encode="@.putLongLong(#)"    decode="# = @.getLongLong()"  accessor="direct" init="0"/>
 <type name="deltaTime" base="DELTATIME" cpp="uint64_t"      encode="@.putLongLong(#)"    decode="# = @.getLongLong()"  accessor="direct" init="0"/>
 <type name="float"     base="FLOAT"     cpp="float"         encode="@.putFloat(#)"       decode="# = @.getFloat()"     accessor="direct" init="0."/>
 <type name="double"    base="DOUBLE"    cpp="double"        encode="@.putDouble(#)"      decode="# = @.getDouble()"    accessor="direct" init="0."/>
-<type name="uuid"      base="UUID"      cpp="framing::Uuid" encode="#.encode(@)"         decode="#.decode(@)"          accessor="direct"/>
-<type name="map"       base="FTABLE"    cpp="framing::FieldTable" encode="#.encode(@)"   decode="#.decode(@)"          accessor="direct"/>
+<type name="uuid"      base="UUID"      cpp="::qpid::framing::Uuid" encode="#.encode(@)"       decode="#.decode(@)"    accessor="direct" byRef="y"/>
+<type name="map"       base="FTABLE"    cpp="::qpid::framing::FieldTable" encode="#.encode(@)" decode="#.decode(@)"    accessor="direct" byRef="y"/>
 
 <type name="hilo8"   base="U8"   cpp="uint8_t"  encode="@.putOctet(#)"    decode="# = @.getOctet()"    style="wm" accessor="counter" init="0"/>
 <type name="hilo16"  base="U16"  cpp="uint16_t" encode="@.putShort(#)"    decode="# = @.getShort()"    style="wm" accessor="counter" init="0"/>
diff --git a/qpid/cpp/managementgen/qmf/schema.py b/qpid/cpp/managementgen/qmf/schema.py
index 26bad618f7..12a325ed80 100755
--- a/qpid/cpp/managementgen/qmf/schema.py
+++ b/qpid/cpp/managementgen/qmf/schema.py
@@ -35,6 +35,7 @@ class SchemaType:
     self.accessor  = None
     self.init      = "0"
     self.perThread = False
+    self.byRef     = False
 
     attrs = node.attributes
     for idx in range (attrs.length):
@@ -69,6 +70,11 @@ class SchemaType:
           raise ValueError ("Expected 'y' in perThread attribute")
         self.perThread = True
 
+      elif key == 'byRef':
+        if val != 'y':
+          raise ValueError ("Expected 'y' in byRef attribute")
+        self.byRef = True
+
       else:
         raise ValueError ("Unknown attribute in type '%s'" % key)
 
@@ -76,6 +82,11 @@ class SchemaType:
        self.encode == None or self.decode == None:
       raise ValueError ("Missing required attribute(s) in type")
 
+    if self.byRef:
+      self.asArg = "const " + self.cpp + "&"
+    else:
+      self.asArg = self.cpp
+
   def getName (self):
     return self.name
 
@@ -87,9 +98,9 @@ class SchemaType:
     else:
       prefix = ""
     if self.accessor == "direct":
-      stream.write ("    inline void set_" + varName + " (" + self.cpp + " val) {\n");
+      stream.write ("    inline void set_" + varName + " (" + self.asArg + " val) {\n");
       if not self.perThread:
-        stream.write ("        sys::Mutex::ScopedLock mutex(accessLock);\n")
+        stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
       if self.style != "mma":
         stream.write ("        " + prefix + varName + " = val;\n")
         if optional:
@@ -110,9 +121,9 @@ class SchemaType:
         stream.write ("        " + changeFlag + " = true;\n")
       stream.write ("    }\n")
       if self.style != "mma":
-        stream.write ("    inline " + self.cpp + "& get_" + varName + "() {\n");
+        stream.write ("    inline " + self.asArg + " get_" + varName + "() {\n");
         if not self.perThread:
-          stream.write ("        sys::Mutex::ScopedLock mutex(accessLock);\n")
+          stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
         stream.write ("        return " + prefix + varName + ";\n")
         stream.write ("    }\n")
       if optional:
@@ -125,9 +136,9 @@ class SchemaType:
         stream.write ("        return (presenceMask[presenceByte_%s] & presenceMask_%s) != 0;\n" % (varName, varName))
         stream.write ("    }\n")
     elif self.accessor == "counter":
-      stream.write ("    inline void inc_" + varName + " (" + self.cpp + " by = 1) {\n");
+      stream.write ("    inline void inc_" + varName + " (" + self.asArg + " by = 1) {\n");
       if not self.perThread:
-        stream.write ("        sys::Mutex::ScopedLock mutex(accessLock);\n")
+        stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
       stream.write ("        " + prefix + varName + " += by;\n")
       if self.style == "wm":
         stream.write ("        if (" + varName + "High < " + varName + ")\n")
@@ -135,9 +146,9 @@ class SchemaType:
       if changeFlag != None:
         stream.write ("        " + changeFlag + " = true;\n")
       stream.write ("    }\n");
-      stream.write ("    inline void dec_" + varName + " (" + self.cpp + " by = 1) {\n");
+      stream.write ("    inline void dec_" + varName + " (" + self.asArg + " by = 1) {\n");
       if not self.perThread:
-        stream.write ("        sys::Mutex::ScopedLock mutex(accessLock);\n")
+        stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
       stream.write ("        " + prefix + varName + " -= by;\n")
       if self.style == "wm":
         stream.write ("        if (" + varName + "Low > " + varName + ")\n")
@@ -316,7 +327,7 @@ class SchemaProperty:
     stream.write (prefix + self.type.type.cpp + " " + self.name + ";\n")
 
   def genFormalParam (self, stream, variables):
-    stream.write (self.type.type.cpp + " _" + self.name)
+    stream.write (self.type.type.asArg + " _" + self.name)
 
   def genAccessor (self, stream):
     self.type.type.genAccessor (stream, self.name, "configChanged", self.isOptional == 1)
@@ -578,7 +589,7 @@ class SchemaArg:
     stream.write ("    buf.put (ft);\n\n")
 
   def genFormalParam (self, stream, variables):
-    stream.write ("%s _%s" % (self.type.type.cpp, self.name))
+    stream.write ("%s _%s" % (self.type.type.asArg, self.name))
 
 #=====================================================================================
 #
@@ -631,12 +642,21 @@ class SchemaMethod:
   def genNameCamel (self, stream, variables):
     stream.write (self.getFullName ())
 
+  def genOpenNamespaces (self, stream, variables):
+    self.parent.genOpenNamespaces(stream, variables)
+
+  def genCloseNamespaces (self, stream, variables):
+    self.parent.genCloseNamespaces(stream, variables)
+
   def genArguments (self, stream, variables):
     for arg in self.args:
       ctype  = arg.type.type.cpp
       dirTag = arg.dir.lower() + "_"
       stream.write ("    " + ctype + " " + dirTag + arg.getName () + ";\n")
 
+  def genNamePackageLower (self, stream, variables):
+    self.parent.genNamePackageLower(stream, variables)
+
   def genSchema (self, stream, variables):
     stream.write ("    ft = FieldTable ();\n")
     stream.write ("    ft.setString (NAME,     \"" + self.name + "\");\n")
@@ -702,7 +722,7 @@ class SchemaEvent:
       if count < len(self.args):
         stream.write(", ")
     stream.write(") {\n")
-    stream.write("    sys::Mutex::ScopedLock mutex(getMutex());\n")
+    stream.write("    ::qpid::sys::Mutex::ScopedLock mutex(getMutex());\n")
     stream.write("    Buffer* buf = startEventLH();\n")
     stream.write("    objectId.encode(*buf);\n")
     stream.write("    buf->putShortString(packageName);\n")
@@ -879,6 +899,10 @@ class SchemaClass:
       if inst.assign == None:
         inst.genAccessor (stream)
 
+  def genCloseNamespaces (self, stream, variables):
+    for item in self.packageName.split("."):
+      stream.write ("}")
+
   def genConfigCount (self, stream, variables):
     stream.write ("%d" % len (self.properties))
 
@@ -981,6 +1005,9 @@ class SchemaClass:
       if element.type.type.perThread:
         element.genDeclaration (stream, "        ")
 
+  def genNamespace (self, stream, variables):
+    stream.write("::".join(self.packageName.split(".")))
+
   def genMethodArgIncludes (self, stream, variables):
     for method in self.methods:
       if method.getArgCount () > 0:
@@ -993,7 +1020,7 @@ class SchemaClass:
     for method in self.methods:
       stream.write ("\n    if (methodName == \"" + method.getName () + "\") {\n")
       if method.getArgCount () == 0:
-        stream.write ("        ArgsNone ioArgs;\n")
+        stream.write ("        ::qpid::management::ArgsNone ioArgs;\n")
       else:
         stream.write ("        Args" + method.getFullName () + " ioArgs;\n")
       for arg in method.args:
@@ -1006,7 +1033,7 @@ class SchemaClass:
       stream.write ("        status = coreObject->ManagementMethod (METHOD_" +\
                     method.getName().upper() + ", ioArgs, text);\n")
       stream.write ("        outBuf.putLong        (status);\n")
-      stream.write ("        outBuf.putShortString (Manageable::StatusText (status, text));\n")
+      stream.write ("        outBuf.putShortString (::qpid::management::Manageable::StatusText (status, text));\n")
       for arg in method.args:
         if arg.getDir () == "O" or arg.getDir () == "IO":
           stream.write ("        " +\
@@ -1015,6 +1042,10 @@ class SchemaClass:
                                                     arg.name, "outBuf") + ";\n")
       stream.write ("        return;\n    }\n")
 
+  def genOpenNamespaces (self, stream, variables):
+    for item in self.packageName.split("."):
+      stream.write ("namespace %s {\n" % item)
+
   def genPresenceMaskBytes (self, stream, variables):
     count = 0
     for prop in self.properties:
@@ -1040,7 +1071,7 @@ class SchemaClass:
   def genSetGeneralReferenceDeclaration (self, stream, variables):
     for prop in self.properties:
       if prop.isGeneralRef:
-        stream.write ("void setReference(ObjectId objectId) { " + prop.name + " = objectId; }\n")
+        stream.write ("void setReference(::qpid::management::ObjectId objectId) { " + prop.name + " = objectId; }\n")
 
   def genStatisticSchema (self, stream, variables):
     for stat in self.statistics:
@@ -1075,7 +1106,7 @@ class SchemaClass:
   def genParentArg (self, stream, variables):
     for config in self.properties:
       if config.isParentRef == 1:
-        stream.write (", Manageable* _parent")
+        stream.write (", ::qpid::management::Manageable* _parent")
         return
 
   def genParentRefAssignment (self, stream, variables):
@@ -1112,7 +1143,7 @@ class SchemaClass:
 
 
 
-class PackageSchema:
+class SchemaPackage:
   def __init__ (self, typefile, schemafile, options):
 
     self.classes   = []
@@ -1124,7 +1155,9 @@ class PackageSchema:
     if document.tagName != 'schema':
       raise ValueError ("Expected 'schema' node")
     attrs = document.attributes
-    self.packageName = makeValidCppSymbol(attrs['package'].nodeValue)
+    pname = attrs['package'].nodeValue
+    namelist = pname.split('.')
+    self.packageName = ".".join(namelist)
 
     children = document.childNodes
     for child in children:
@@ -1148,14 +1181,29 @@ class PackageSchema:
   def getPackageNameCap (self):
     return capitalize(self.packageName)
 
+  def getPackageNameLower (self):
+    return self.packageName.lower()
+
   def getClasses (self):
     return self.classes
 
+  def genCloseNamespaces (self, stream, variables):
+    for item in self.packageName.split("."):
+      stream.write ("}")
+
+  def genNamespace (self, stream, variables):
+    stream.write("::".join(self.packageName.split(".")))
+
+  def genOpenNamespaces (self, stream, variables):
+    for item in self.packageName.split("."):
+      stream.write ("namespace %s {\n" % item)
+
   def genPackageNameUpper (self, stream, variables):
-    stream.write (self.packageName.upper ())
+    up = "_".join(self.packageName.split("."))
+    stream.write (up.upper())
 
-  def genPackageNameCap (self, stream, variables):
-    stream.write (self.getPackageNameCap ())
+  def genNamePackageLower (self, stream, variables):
+    stream.write (self.packageName.lower ())
 
   def genClassIncludes (self, stream, variables):
     for _class in self.classes:
diff --git a/qpid/cpp/managementgen/qmf/templates/Args.h b/qpid/cpp/managementgen/qmf/templates/Args.h
index 576d891a3f..89a5bec9b9 100644
--- a/qpid/cpp/managementgen/qmf/templates/Args.h
+++ b/qpid/cpp/managementgen/qmf/templates/Args.h
@@ -26,15 +26,15 @@
 #include "qpid/management/Args.h"
 #include <string>
 
-namespace qpid { 
-namespace management {
+namespace qmf { 
+/*MGEN:Method.OpenNamespaces*/
 
-class Args/*MGEN:Method.NameCamel*/ : public Args
+    class Args/*MGEN:Method.NameCamel*/ : public ::qpid::management::Args
 {
   public:
 /*MGEN:Method.Arguments*/
 };
 
-}}
+}/*MGEN:Method.CloseNamespaces*/
 
 #endif  /*!_ARGS_/*MGEN:Method.NameUpper*/_*/
diff --git a/qpid/cpp/managementgen/qmf/templates/Class.cpp b/qpid/cpp/managementgen/qmf/templates/Class.cpp
index 018f325ff1..964e6f8349 100644
--- a/qpid/cpp/managementgen/qmf/templates/Class.cpp
+++ b/qpid/cpp/managementgen/qmf/templates/Class.cpp
@@ -27,9 +27,12 @@
 #include "/*MGEN:Class.NameCap*/.h"
 /*MGEN:Class.MethodArgIncludes*/
 
-using namespace qpid::management;
-using namespace qpid::sys;
+using namespace qmf::/*MGEN:Class.Namespace*/;
 using namespace qpid::framing;
+using           qpid::management::ManagementAgent;
+using           qpid::management::Manageable;
+using           qpid::management::ManagementObject;
+using           qpid::management::Args;
 using           std::string;
 
 string  /*MGEN:Class.NameCap*/::packageName  = string ("/*MGEN:Class.NamePackageLower*/");
@@ -125,7 +128,7 @@ void /*MGEN:Class.NameCap*/::aggregatePerThreadStats(struct PerThreadStats* tota
 
 void /*MGEN:Class.NameCap*/::writeProperties (Buffer& buf)
 {
-    sys::Mutex::ScopedLock mutex(accessLock);
+    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
     configChanged = false;
 
     writeTimestamps (buf);
@@ -138,7 +141,7 @@ void /*MGEN:Class.NameCap*/::writeProperties (Buffer& buf)
 
 void /*MGEN:Class.NameCap*/::writeStatistics (Buffer& buf, bool skipHeaders)
 {
-    sys::Mutex::ScopedLock mutex(accessLock);
+    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
     instChanged = false;
 /*MGEN:IF(Class.ExistPerThreadAssign)*/
     for (int idx = 0; idx < maxThreads; idx++) {
diff --git a/qpid/cpp/managementgen/qmf/templates/Class.h b/qpid/cpp/managementgen/qmf/templates/Class.h
index 40ad20eb85..99ebc68789 100644
--- a/qpid/cpp/managementgen/qmf/templates/Class.h
+++ b/qpid/cpp/managementgen/qmf/templates/Class.h
@@ -27,10 +27,10 @@
 #include "qpid/framing/FieldTable.h"
 #include "qpid/framing/Uuid.h"
 
-namespace qpid {
-namespace management {
+namespace qmf {
+/*MGEN:Class.OpenNamespaces*/
 
-class /*MGEN:Class.NameCap*/ : public ManagementObject
+class /*MGEN:Class.NameCap*/ : public ::qpid::management::ManagementObject
 {
   private:
 
@@ -68,13 +68,13 @@ class /*MGEN:Class.NameCap*/ : public ManagementObject
     void aggregatePerThreadStats(struct PerThreadStats*);
 /*MGEN:ENDIF*/
     // Private Methods
-    static void writeSchema (qpid::framing::Buffer& buf);
-    void writeProperties    (qpid::framing::Buffer& buf);
-    void writeStatistics    (qpid::framing::Buffer& buf,
+    static void writeSchema (::qpid::framing::Buffer& buf);
+    void writeProperties    (::qpid::framing::Buffer& buf);
+    void writeStatistics    (::qpid::framing::Buffer& buf,
                              bool skipHeaders = false);
     void doMethod           (std::string            methodName,
-                             qpid::framing::Buffer& inBuf,
-                             qpid::framing::Buffer& outBuf);
+                             ::qpid::framing::Buffer& inBuf,
+                             ::qpid::framing::Buffer& outBuf);
     writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; }
 /*MGEN:IF(Class.NoStatistics)*/
     // Stub for getInstChanged.  There are no statistics in this class.
@@ -82,13 +82,13 @@ class /*MGEN:Class.NameCap*/ : public ManagementObject
 /*MGEN:ENDIF*/
   public:
 
-    /*MGEN:Class.NameCap*/ (ManagementAgent* agent,
-                            Manageable* coreObject/*MGEN:Class.ParentArg*//*MGEN:Class.ConstructorArgs*/);
+    /*MGEN:Class.NameCap*/ (::qpid::management::ManagementAgent* agent,
+                            ::qpid::management::Manageable* coreObject/*MGEN:Class.ParentArg*//*MGEN:Class.ConstructorArgs*/);
     ~/*MGEN:Class.NameCap*/ (void);
 
     /*MGEN:Class.SetGeneralReferenceDeclaration*/
 
-    static void  registerClass  (ManagementAgent* agent);
+    static void  registerClass  (::qpid::management::ManagementAgent* agent);
     std::string& getPackageName (void) { return packageName; }
     std::string& getClassName   (void) { return className; }
     uint8_t*     getMd5Sum      (void) { return md5Sum; }
@@ -101,6 +101,6 @@ class /*MGEN:Class.NameCap*/ : public ManagementObject
 /*MGEN:Class.EventMethodDecls*/
 };
 
-}}
+}/*MGEN:Class.CloseNamespaces*/
 
 #endif  /*!_MANAGEMENT_/*MGEN:Class.NameUpper*/_*/
diff --git a/qpid/cpp/managementgen/qmf/templates/Package.cpp b/qpid/cpp/managementgen/qmf/templates/Package.cpp
index 15e7fc15ec..f6bd7f4654 100644
--- a/qpid/cpp/managementgen/qmf/templates/Package.cpp
+++ b/qpid/cpp/managementgen/qmf/templates/Package.cpp
@@ -20,12 +20,12 @@
 
 /*MGEN:Root.Disclaimer*/
 
-#include "Package/*MGEN:Schema.PackageNameCap*/.h"
+#include "Package.h"
 /*MGEN:Schema.ClassIncludes*/
 
-using namespace qpid::management;
+using namespace qmf::/*MGEN:Schema.Namespace*/;
 
-Package/*MGEN:Schema.PackageNameCap*/::Package/*MGEN:Schema.PackageNameCap*/ (ManagementAgent* agent)
+Package::Package (::qpid::management::ManagementAgent* agent)
 {
 /*MGEN:Schema.ClassRegisters*/
 }
diff --git a/qpid/cpp/managementgen/qmf/templates/Package.h b/qpid/cpp/managementgen/qmf/templates/Package.h
index 3f3ac35ffc..0ad7060b9e 100644
--- a/qpid/cpp/managementgen/qmf/templates/Package.h
+++ b/qpid/cpp/managementgen/qmf/templates/Package.h
@@ -25,17 +25,17 @@
 
 #include "qpid/agent/ManagementAgent.h"
 
-namespace qpid {
-namespace management {
+namespace qmf {
+/*MGEN:Class.OpenNamespaces*/
 
-class Package/*MGEN:Schema.PackageNameCap*/
+class Package
 {
   public:
-    Package/*MGEN:Schema.PackageNameCap*/ (ManagementAgent* agent);
-    ~Package/*MGEN:Schema.PackageNameCap*/ () {}
+    Package (::qpid::management::ManagementAgent* agent);
+    ~Package () {}
 };
 
-}}
+}/*MGEN:Class.CloseNamespaces*/
             
 
 #endif  /*!_MANAGEMENT_PACKAGE_/*MGEN:Schema.PackageNameUpper*/_*/