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

44 files changed, 280 insertions, 207 deletions

diff --git a/qpid/cpp/examples/qmf-agent/Makefile b/qpid/cpp/examples/qmf-agent/Makefile
index 0759644670..0fc7ece413 100644
--- a/qpid/cpp/examples/qmf-agent/Makefile
+++ b/qpid/cpp/examples/qmf-agent/Makefile
@@ -25,7 +25,7 @@ OUT_FILE    = $(SRC_DIR)/qmf-agent
 
 CC           = gcc
 LIB_DIR      = $(QPID_DIR)/cpp/src/.libs
-CC_INCLUDES  = -I$(SRC_DIR) -I$(QPID_DIR)/cpp/src -I$(QPID_DIR)/cpp/src/gen -I$(GEN_DIR)
+CC_INCLUDES  = -I$(SRC_DIR) -I$(QPID_DIR)/cpp/src -I$(QPID_DIR)/cpp/src/gen -I$(GEN_DIR)/org/apache/qpid/agent/example
 CC_FLAGS     = -g -O3
 LD_FLAGS     = -lqmfagent -L$(LIB_DIR)
 SPEC_DIR     = $(QPID_DIR)/specs
@@ -37,7 +37,7 @@ vpath %.d   $(OBJ_DIR)
 vpath %.o   $(OBJ_DIR)
 
 cpps    = $(wildcard $(SRC_DIR)/*.cpp)
-cpps   += $(wildcard $(GEN_DIR)/*.cpp)
+cpps   += $(wildcard $(GEN_DIR)/org/apache/qpid/agent/example/*.cpp)
 deps    = $(addsuffix .d, $(basename $(cpps)))
 objects = $(addsuffix .o, $(basename $(cpps)))
 
diff --git a/qpid/cpp/examples/qmf-agent/example.cpp b/qpid/cpp/examples/qmf-agent/example.cpp
index 3422704d60..2087ee0811 100644
--- a/qpid/cpp/examples/qmf-agent/example.cpp
+++ b/qpid/cpp/examples/qmf-agent/example.cpp
@@ -26,7 +26,7 @@
 #include "Parent.h"
 #include "Child.h"
 #include "ArgsParentCreate_child.h"
-#include "PackageQmf_example.h"
+#include "Package.h"
 
 #include <unistd.h>
 #include <cstdlib>
@@ -34,13 +34,13 @@
 
 #include <sstream>
 
-using namespace qpid::management;
-using namespace qpid::sys;
 using namespace std;
+using qpid::management::ManagementAgent;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
 using qpid::sys::Mutex;
+namespace _qmf = qmf::org::apache::qpid::agent::example;
 
 class ChildClass;
 
@@ -52,7 +52,7 @@ class CoreClass : public Manageable
 {
     string           name;
     ManagementAgent* agent;
-    Parent* mgmtObject;
+    _qmf::Parent* mgmtObject;
     std::vector<ChildClass*> children;
     Mutex vectorLock;
 
@@ -71,7 +71,7 @@ public:
 class ChildClass : public Manageable
 {
     string name;
-    Child* mgmtObject;
+    _qmf::Child* mgmtObject;
 
 public:
 
@@ -90,7 +90,7 @@ public:
 CoreClass::CoreClass(ManagementAgent* _agent, string _name) : name(_name), agent(_agent)
 {
     static uint64_t persistId = 0x111222333444555LL;
-    mgmtObject = new Parent(agent, this, name);
+    mgmtObject = new _qmf::Parent(agent, this, name);
 
     agent->addObject(mgmtObject, persistId++);
     mgmtObject->set_state("IDLE");
@@ -102,7 +102,7 @@ void CoreClass::doLoop()
     while (1) {
         sleep(1);
         mgmtObject->inc_count();
-        mgmtObject->set_state("IN LOOP");
+        mgmtObject->set_state("IN_LOOP");
 
         {
             Mutex::ScopedLock _lock(vectorLock);
@@ -121,8 +121,8 @@ Manageable::status_t CoreClass::ManagementMethod(uint32_t methodId, Args& args,
     Mutex::ScopedLock _lock(vectorLock);
 
     switch (methodId) {
-    case Parent::METHOD_CREATE_CHILD:
-        ArgsParentCreate_child& ioArgs = (ArgsParentCreate_child&) args;
+    case _qmf::Parent::METHOD_CREATE_CHILD:
+        _qmf::ArgsParentCreate_child& ioArgs = (_qmf::ArgsParentCreate_child&) args;
 
         ChildClass *child = new ChildClass(agent, this, ioArgs.i_name);
         ioArgs.o_childRef = child->GetManagementObject()->getObjectId();
@@ -139,7 +139,7 @@ Manageable::status_t CoreClass::ManagementMethod(uint32_t methodId, Args& args,
 
 ChildClass::ChildClass(ManagementAgent* agent, CoreClass* parent, string name)
 {
-    mgmtObject = new Child(agent, this, parent, name);
+    mgmtObject = new _qmf::Child(agent, this, parent, name);
 
     agent->addObject(mgmtObject);
 }
@@ -158,7 +158,7 @@ int main_int(int argc, char** argv)
     ManagementAgent* agent = singleton.getInstance();
 
     // Register the Qmf_example schema with the agent
-    PackageQmf_example packageInit(agent);
+    _qmf::Package packageInit(agent);
 
     // Start the agent.  It will attempt to make a connection to the
     // management broker
diff --git a/qpid/cpp/examples/qmf-agent/schema.xml b/qpid/cpp/examples/qmf-agent/schema.xml
index b0f25fcbed..22ecabb8a5 100644
--- a/qpid/cpp/examples/qmf-agent/schema.xml
+++ b/qpid/cpp/examples/qmf-agent/schema.xml
@@ -1,4 +1,4 @@
-<schema package="qmf_example">
+<schema package="org.apache.qpid.agent.example">
 
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
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*/_*/
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 9b391a907f..9bef06e7bb 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -28,7 +28,7 @@ $(rgen_generator):
 
 # Management generator.
 mgen_dir=$(top_srcdir)/managementgen
-mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk -o gen/qpid/management \
+mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk -o gen/qmf \
 	$(top_srcdir)/../specs/management-schema.xml \
 	$(srcdir)/qpid/acl/management-schema.xml
 
diff --git a/qpid/cpp/src/qpid/DataDir.h b/qpid/cpp/src/qpid/DataDir.h
index 7de5ebf62d..6b45d8747b 100644
--- a/qpid/cpp/src/qpid/DataDir.h
+++ b/qpid/cpp/src/qpid/DataDir.h
@@ -41,8 +41,8 @@ class DataDir
     DataDir (std::string path);
     ~DataDir ();
 
-    bool        isEnabled () { return enabled; }
-    std::string getPath   () { return dirPath; }
+    bool isEnabled() { return enabled; }
+    const std::string& getPath() { return dirPath; }
 };
  
 } // namespace qpid
diff --git a/qpid/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp
index f9c307c7d3..0a793c88e0 100644
--- a/qpid/cpp/src/qpid/acl/Acl.cpp
+++ b/qpid/cpp/src/qpid/acl/Acl.cpp
@@ -24,39 +24,38 @@
 #include "qpid/Options.h"
 #include "qpid/shared_ptr.h"
 #include "qpid/log/Logger.h"
-#include "qpid/management/PackageACL.h"
+#include "qmf/org/apache/qpid/acl/Package.h"
 
 #include <map>
 
 #include <boost/utility/in_place_factory.hpp>
 
-namespace qpid {
-namespace acl {
-
 using namespace std;
+using namespace qpid::acl;
 using qpid::management::ManagementAgent;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
+namespace _qmf = qmf::org::apache::qpid::acl;
 
-   Acl::Acl (AclValues& av, broker::Broker& b): aclValues(av), broker(&b), transferAcl(false)
-   {
+Acl::Acl (AclValues& av, broker::Broker& b): aclValues(av), broker(&b), transferAcl(false)
+{
 	   
-	   ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
-
-       if (agent != 0){
-            management::PackageACL  packageInit(agent);
-            mgmtObject = new management::Acl (agent, this, broker);
-			agent->addObject (mgmtObject);
-       }
-
-       if (!readAclFile()){
-	       throw Exception("Could not read ACL file");
-		   if (mgmtObject!=0) mgmtObject->set_enforcingAcl(0);
-	   }
-	   QPID_LOG(info, "ACL Plugin loaded");
+    ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
+
+    if (agent != 0){
+        _qmf::Package  packageInit(agent);
+        mgmtObject = new _qmf::Acl (agent, this, broker);
+        agent->addObject (mgmtObject);
+    }
+
+    if (!readAclFile()){
+        throw Exception("Could not read ACL file");
+        if (mgmtObject!=0) mgmtObject->set_enforcingAcl(0);
+    }
+    QPID_LOG(info, "ACL Plugin loaded");
 	   if (mgmtObject!=0) mgmtObject->set_enforcingAcl(1);
-   }
+}
 
    bool Acl::authorise(const std::string& id, const Action& action, const ObjectType& objType, const std::string& name, std::map<Property, std::string>* params)
    {
@@ -147,7 +146,7 @@ using qpid::management::Args;
 
       switch (methodId)
       {
-      case management::Acl::METHOD_RELOADACLFILE :
+      case _qmf::Acl::METHOD_RELOADACLFILE :
           readAclFile();
           status = Manageable::STATUS_OK;
           break;
@@ -155,4 +154,3 @@ using qpid::management::Args;
 
     return status;
 }    
-}} // namespace qpid::acl
diff --git a/qpid/cpp/src/qpid/acl/Acl.h b/qpid/cpp/src/qpid/acl/Acl.h
index 22450709d9..b072d24cc0 100644
--- a/qpid/cpp/src/qpid/acl/Acl.h
+++ b/qpid/cpp/src/qpid/acl/Acl.h
@@ -27,7 +27,7 @@
 #include "qpid/RefCounted.h"
 #include "qpid/broker/AclModule.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Acl.h"
+#include "qmf/org/apache/qpid/acl/Acl.h"
 
 #include <map>
 #include <string>
@@ -56,7 +56,7 @@ private:
    broker::Broker* broker;
    bool transferAcl;
    boost::shared_ptr<AclData> data;
-   management::Acl* mgmtObject; // mgnt owns lifecycle
+   qmf::org::apache::qpid::acl::Acl* mgmtObject; // mgnt owns lifecycle
 
 
 public:
diff --git a/qpid/cpp/src/qpid/acl/management-schema.xml b/qpid/cpp/src/qpid/acl/management-schema.xml
index ebd1eb2a53..7d20353755 100644
--- a/qpid/cpp/src/qpid/acl/management-schema.xml
+++ b/qpid/cpp/src/qpid/acl/management-schema.xml
@@ -1,4 +1,4 @@
-<schema package="ACL">
+<schema package="org.apache.qpid.acl">
 
 <!--
  * Copyright (c) 2008 The Apache Software Foundation
diff --git a/qpid/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
index 6e8dd818e5..93333f1410 100644
--- a/qpid/cpp/src/qpid/broker/Bridge.cpp
+++ b/qpid/cpp/src/qpid/broker/Bridge.cpp
@@ -31,20 +31,22 @@ using qpid::framing::FieldTable;
 using qpid::framing::Uuid;
 using qpid::framing::Buffer;
 using qpid::management::ManagementAgent;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 namespace qpid {
 namespace broker {
 
 Bridge::Bridge(Link* _link, framing::ChannelId _id, CancellationListener l,
-               const management::ArgsLinkBridge& _args) : 
+               const _qmf::ArgsLinkBridge& _args) : 
     link(_link), id(_id), args(_args), mgmtObject(0),
     listener(l), name(Uuid(true).str()), persistenceId(0)
 {
     ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
     if (agent != 0) {
-        mgmtObject = new management::Bridge(agent, this, link, id, args.i_durable, args.i_src, args.i_dest,
-                                            args.i_key, args.i_srcIsQueue, args.i_srcIsLocal,
-                                            args.i_tag, args.i_excludes);
+        mgmtObject = new _qmf::Bridge
+            (agent, this, link, id, args.i_durable, args.i_src, args.i_dest,
+             args.i_key, args.i_srcIsQueue, args.i_srcIsLocal,
+             args.i_tag, args.i_excludes);
         if (!args.i_durable)
             agent->addObject(mgmtObject);
     }
@@ -182,7 +184,7 @@ management::Manageable::status_t Bridge::ManagementMethod(uint32_t methodId,
                                                           management::Args& /*args*/,
                                                           string&)
 {
-    if (methodId == management::Bridge::METHOD_CLOSE) {  
+    if (methodId == _qmf::Bridge::METHOD_CLOSE) {  
         //notify that we are closed
         destroy();
         return management::Manageable::STATUS_OK;
diff --git a/qpid/cpp/src/qpid/broker/Bridge.h b/qpid/cpp/src/qpid/broker/Bridge.h
index 8286f080d5..5ca73e4004 100644
--- a/qpid/cpp/src/qpid/broker/Bridge.h
+++ b/qpid/cpp/src/qpid/broker/Bridge.h
@@ -26,8 +26,8 @@
 #include "qpid/framing/ChannelHandler.h"
 #include "qpid/framing/Buffer.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/ArgsLinkBridge.h"
-#include "qpid/management/Bridge.h"
+#include "qmf/org/apache/qpid/broker/ArgsLinkBridge.h"
+#include "qmf/org/apache/qpid/broker/Bridge.h"
 
 #include <boost/function.hpp>
 #include <memory>
@@ -45,7 +45,8 @@ public:
     typedef boost::shared_ptr<Bridge> shared_ptr;
     typedef boost::function<void(Bridge*)> CancellationListener;
 
-    Bridge(Link* link, framing::ChannelId id, CancellationListener l, const management::ArgsLinkBridge& args);
+    Bridge(Link* link, framing::ChannelId id, CancellationListener l,
+           const qmf::org::apache::qpid::broker::ArgsLinkBridge& args);
     ~Bridge();
 
     void create(ConnectionState& c);
@@ -73,8 +74,8 @@ private:
 
     Link* link;
     framing::ChannelId          id;
-    management::ArgsLinkBridge  args;
-    management::Bridge*         mgmtObject;
+    qmf::org::apache::qpid::broker::ArgsLinkBridge args;
+    qmf::org::apache::qpid::broker::Bridge*        mgmtObject;
     CancellationListener        listener;
     std::string name;
     mutable uint64_t  persistenceId;
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index a56b2bd392..8b3be54d15 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -30,9 +30,9 @@
 #include "TopicExchange.h"
 #include "Link.h"
 
-#include "qpid/management/PackageQpid.h"
+#include "qmf/org/apache/qpid/broker/Package.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerEcho.h"
 #include "qpid/management/ManagementExchange.h"
-#include "qpid/management/ArgsBrokerEcho.h"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/framing/ProtocolInitiation.h"
@@ -70,7 +70,7 @@ using qpid::management::ManagementBroker;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
-using qpid::management::ArgsBrokerEcho;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 namespace qpid {
 namespace broker {
@@ -146,12 +146,12 @@ Broker::Broker(const Broker::Options& conf) :
         ((ManagementBroker*) managementAgent)->configure
             (dataDir.isEnabled () ? dataDir.getPath () : string (),
              conf.mgmtPubInterval, this, conf.workerThreads + 3);
-        qpid::management::PackageQpid packageInitializer (managementAgent);
+        _qmf::Package packageInitializer (managementAgent);
 
         System* system = new System (dataDir.isEnabled () ? dataDir.getPath () : string ());
         systemObject = System::shared_ptr (system);
 
-        mgmtObject = new management::Broker (managementAgent, this, system, conf.port);
+        mgmtObject = new _qmf::Broker (managementAgent, this, system, conf.port);
         mgmtObject->set_workerThreads    (conf.workerThreads);
         mgmtObject->set_maxConns         (conf.maxConnections);
         mgmtObject->set_connBacklog      (conf.connectionBacklog);
@@ -330,12 +330,12 @@ Manageable::status_t Broker::ManagementMethod (uint32_t methodId,
 
     switch (methodId)
     {
-    case management::Broker::METHOD_ECHO :
+    case _qmf::Broker::METHOD_ECHO :
         status = Manageable::STATUS_OK;
         break;
-    case management::Broker::METHOD_CONNECT : {
-        management::ArgsBrokerConnect& hp=
-            dynamic_cast<management::ArgsBrokerConnect&>(args);
+    case _qmf::Broker::METHOD_CONNECT : {
+        _qmf::ArgsBrokerConnect& hp=
+            dynamic_cast<_qmf::ArgsBrokerConnect&>(args);
 
         if (hp.i_useSsl)
             return Manageable::STATUS_FEATURE_NOT_IMPLEMENTED;
diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index 5b701e8513..39b9c334eb 100644
--- a/qpid/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -35,8 +35,8 @@
 #include "System.h"
 #include "qpid/management/Manageable.h"
 #include "qpid/management/ManagementBroker.h"
-#include "qpid/management/Broker.h"
-#include "qpid/management/ArgsBrokerConnect.h"
+#include "qmf/org/apache/qpid/broker/Broker.h"
+#include "qmf/org/apache/qpid/broker/ArgsBrokerConnect.h"
 #include "qpid/Options.h"
 #include "qpid/Plugin.h"
 #include "qpid/DataDir.h"
@@ -107,7 +107,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
     DtxManager dtxManager;
     SessionManager sessionManager;
     management::ManagementAgent* managementAgent;
-    management::Broker*          mgmtObject;
+    qmf::org::apache::qpid::broker::Broker* mgmtObject;
     Vhost::shared_ptr            vhostObject;
     System::shared_ptr           systemObject;
 
diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index 5bc3c175b3..dd62c8e6e8 100644
--- a/qpid/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
@@ -43,6 +43,7 @@ using qpid::management::ManagementAgent;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 namespace qpid {
 namespace broker {
@@ -68,7 +69,7 @@ Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_, const std
 		
         // TODO set last bool true if system connection
         if (agent != 0)
-            mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink,false);
+            mgmtObject = new _qmf::Connection(agent, this, parent, mgmtId, !isLink, false);
         agent->addObject(mgmtObject);
     }
 }
@@ -232,7 +233,7 @@ Manageable::status_t Connection::ManagementMethod(uint32_t methodId, Args&, stri
 
     switch (methodId)
     {
-    case management::Connection::METHOD_CLOSE :
+    case _qmf::Connection::METHOD_CLOSE :
         mgmtClosing = true;
         if (mgmtObject != 0) mgmtObject->set_closing(1);
         out.activateOutput();
diff --git a/qpid/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
index 137a829f7f..b81f1eda21 100644
--- a/qpid/cpp/src/qpid/broker/Connection.h
+++ b/qpid/cpp/src/qpid/broker/Connection.h
@@ -43,7 +43,7 @@
 #include "ConnectionState.h"
 #include "SessionHandler.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Connection.h"
+#include "qmf/org/apache/qpid/broker/Connection.h"
 #include "qpid/RefCounted.h"
 
 #include <boost/ptr_container/ptr_map.hpp>
@@ -104,7 +104,7 @@ class Connection : public sys::ConnectionInputHandler,
     bool mgmtClosing;
     const std::string mgmtId;
     boost::function0<void> ioCallback;
-    management::Connection* mgmtObject;
+    qmf::org::apache::qpid::broker::Connection* mgmtObject;
     LinkRegistry& links;
 };
 
diff --git a/qpid/cpp/src/qpid/broker/DirectExchange.cpp b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
index bc6d7fe495..b4b892feeb 100644
--- a/qpid/cpp/src/qpid/broker/DirectExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
@@ -26,6 +26,7 @@ using namespace qpid::broker;
 using namespace qpid::framing;
 using namespace qpid::sys;
 using qpid::management::Manageable;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 DirectExchange::DirectExchange(const string& _name, Manageable* _parent) : Exchange(_name, _parent)
 {
@@ -47,7 +48,7 @@ bool DirectExchange::bind(Queue::shared_ptr queue, const string& routingKey, con
     if (bindings[routingKey].add_unless(b, MatchQueue(queue))) {
         if (mgmtExchange != 0) {
             mgmtExchange->inc_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->inc_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->inc_bindingCount();
         }
         return true;
     } else {
@@ -60,7 +61,7 @@ bool DirectExchange::unbind(Queue::shared_ptr queue, const string& routingKey, c
     if (bindings[routingKey].remove_if(MatchQueue(queue))) {
         if (mgmtExchange != 0) {
             mgmtExchange->dec_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->dec_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->dec_bindingCount();
         }
         return true;
     } else {
diff --git a/qpid/cpp/src/qpid/broker/Exchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp
index 3c0f3b14e9..553fb8f374 100644
--- a/qpid/cpp/src/qpid/broker/Exchange.cpp
+++ b/qpid/cpp/src/qpid/broker/Exchange.cpp
@@ -30,6 +30,7 @@ using qpid::management::ManagementAgent;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 Exchange::Exchange (const string& _name, Manageable* parent) :
     name(_name), durable(false), persistenceId(0), mgmtExchange(0)
@@ -39,7 +40,7 @@ Exchange::Exchange (const string& _name, Manageable* parent) :
         ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
         if (agent != 0)
         {
-            mgmtExchange = new management::Exchange (agent, this, parent, _name, durable);
+            mgmtExchange = new _qmf::Exchange (agent, this, parent, _name, durable);
             agent->addObject (mgmtExchange);
         }
     }
@@ -54,7 +55,7 @@ Exchange::Exchange(const string& _name, bool _durable, const qpid::framing::Fiel
         ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
         if (agent != 0)
         {
-            mgmtExchange = new management::Exchange (agent, this, parent, _name, durable);
+            mgmtExchange = new _qmf::Exchange (agent, this, parent, _name, durable);
             if (!durable) {
                 if (name == "")
                     agent->addObject (mgmtExchange, 0x1000000000000004LL);  // Special default exchange ID
@@ -131,7 +132,8 @@ Exchange::Binding::Binding(const string& _key, Queue::shared_ptr _queue, Exchang
             if (mo != 0)
             {
                 management::ObjectId queueId = mo->getObjectId();
-                mgmtBinding = new management::Binding (agent, this, (Manageable*) parent, queueId, key, args);
+                mgmtBinding = new _qmf::Binding
+                    (agent, this, (Manageable*) parent, queueId, key, args);
                 agent->addObject (mgmtBinding);
             }
         }
diff --git a/qpid/cpp/src/qpid/broker/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index 4f46741bfe..9901fbb18b 100644
--- a/qpid/cpp/src/qpid/broker/Exchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
@@ -29,8 +29,8 @@
 #include "PersistableExchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Exchange.h"
-#include "qpid/management/Binding.h"
+#include "qmf/org/apache/qpid/broker/Exchange.h"
+#include "qmf/org/apache/qpid/broker/Binding.h"
 
 namespace qpid {
     namespace broker {
@@ -54,7 +54,7 @@ namespace qpid {
                 Queue::shared_ptr         queue;
                 const std::string         key;
                 const framing::FieldTable args;
-                management::Binding* mgmtBinding;
+                qmf::org::apache::qpid::broker::Binding* mgmtBinding;
 
                 Binding(const std::string& key, Queue::shared_ptr queue, Exchange* parent = 0,
                         framing::FieldTable args = framing::FieldTable ());
@@ -68,7 +68,7 @@ namespace qpid {
                 bool operator()(Exchange::Binding::shared_ptr b);
             };
 
-            management::Exchange* mgmtExchange;
+            qmf::org::apache::qpid::broker::Exchange* mgmtExchange;
 
         public:
             typedef boost::shared_ptr<Exchange> shared_ptr;
diff --git a/qpid/cpp/src/qpid/broker/FanOutExchange.cpp b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
index 019c943ca1..1e03d34b25 100644
--- a/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
@@ -24,6 +24,7 @@
 using namespace qpid::broker;
 using namespace qpid::framing;
 using namespace qpid::sys;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 FanOutExchange::FanOutExchange(const std::string& _name, Manageable* _parent) :
     Exchange(_name, _parent)
@@ -46,7 +47,7 @@ bool FanOutExchange::bind(Queue::shared_ptr queue, const string& /*key*/, const
     if (bindings.add_unless(binding, MatchQueue(queue))) {
         if (mgmtExchange != 0) {
             mgmtExchange->inc_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->inc_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->inc_bindingCount();
         }
         return true;
     } else {
@@ -59,7 +60,7 @@ bool FanOutExchange::unbind(Queue::shared_ptr queue, const string& /*key*/, cons
     if (bindings.remove_if(MatchQueue(queue))) {
         if (mgmtExchange != 0) {
             mgmtExchange->dec_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->dec_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->dec_bindingCount();
         }
         return true;
     } else {
diff --git a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
index f7842239da..5f89202c75 100644
--- a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
@@ -28,6 +28,7 @@
 using namespace qpid::broker;
 using namespace qpid::framing;
 using namespace qpid::sys;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 // TODO aconway 2006-09-20: More efficient matching algorithm.
 // The current search algorithm really sucks.
@@ -81,7 +82,7 @@ bool HeadersExchange::bind(Queue::shared_ptr queue, const string& bindingKey, co
     if (bindings.add_unless(binding, MatchArgs(queue, args))) {
         if (mgmtExchange != 0) {
             mgmtExchange->inc_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->inc_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->inc_bindingCount();
         }
         return true;
     } else {
@@ -93,7 +94,7 @@ bool HeadersExchange::unbind(Queue::shared_ptr queue, const string& bindingKey,
     if (bindings.remove_if(MatchKey(queue, bindingKey))) {
         if (mgmtExchange != 0) {
             mgmtExchange->dec_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->dec_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->dec_bindingCount();
         }
         return true;
     } else {
diff --git a/qpid/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
index a53bf9e983..f5a7f3a4c3 100644
--- a/qpid/cpp/src/qpid/broker/Link.cpp
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
@@ -24,7 +24,6 @@
 #include "Broker.h"
 #include "Connection.h"
 #include "qpid/agent/ManagementAgent.h"
-#include "qpid/management/Link.h"
 #include "boost/bind.hpp"
 #include "qpid/log/Statement.h"
 
@@ -36,6 +35,7 @@ using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
 using qpid::sys::Mutex;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 Link::Link(LinkRegistry*  _links,
            MessageStore*  _store,
@@ -62,7 +62,7 @@ Link::Link(LinkRegistry*  _links,
         ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
         if (agent != 0)
         {
-            mgmtObject = new management::Link(agent, this, parent, _host, _port, _useSsl, _durable);
+            mgmtObject = new _qmf::Link(agent, this, parent, _host, _port, _useSsl, _durable);
             if (!durable)
                 agent->addObject(mgmtObject);
         }
@@ -328,14 +328,14 @@ Manageable::status_t Link::ManagementMethod (uint32_t op, management::Args& args
 {
     switch (op)
     {
-    case management::Link::METHOD_CLOSE :
+    case _qmf::Link::METHOD_CLOSE :
         closing = true;
         if (state != STATE_CONNECTING)
             destroy();
         return Manageable::STATUS_OK;
 
-    case management::Link::METHOD_BRIDGE :
-        management::ArgsLinkBridge& iargs = (management::ArgsLinkBridge&) args;
+    case _qmf::Link::METHOD_BRIDGE :
+        _qmf::ArgsLinkBridge& iargs = (_qmf::ArgsLinkBridge&) args;
 
         // Durable bridges are only valid on durable links
         if (iargs.i_durable && !durable)
diff --git a/qpid/cpp/src/qpid/broker/Link.h b/qpid/cpp/src/qpid/broker/Link.h
index 0422141ec7..dea28aad22 100644
--- a/qpid/cpp/src/qpid/broker/Link.h
+++ b/qpid/cpp/src/qpid/broker/Link.h
@@ -29,7 +29,7 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Link.h"
+#include "qmf/org/apache/qpid/broker/Link.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 namespace qpid {
@@ -53,7 +53,7 @@ namespace qpid {
             string        username;
             string        password;
             mutable uint64_t    persistenceId;
-            management::Link*   mgmtObject;
+            qmf::org::apache::qpid::broker::Link* mgmtObject;
             Broker* broker;
             int     state;
             uint32_t visitCount;
diff --git a/qpid/cpp/src/qpid/broker/LinkRegistry.cpp b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
index 0703c276cf..31992d0af5 100644
--- a/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
@@ -26,6 +26,7 @@ using namespace qpid::sys;
 using std::pair;
 using std::stringstream;
 using boost::intrusive_ptr;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 #define LINK_MAINT_INTERVAL 2
 
@@ -107,7 +108,7 @@ pair<Bridge::shared_ptr, bool> LinkRegistry::declare(std::string& host,
     BridgeMap::iterator b = bridges.find(bridgeKey);
     if (b == bridges.end())
     {
-        management::ArgsLinkBridge args;
+        _qmf::ArgsLinkBridge args;
         Bridge::shared_ptr bridge;
 
         args.i_durable    = durable;
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 2dbaef1b13..befc5c4eff 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -31,7 +31,7 @@
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Time.h"
-#include "qpid/management/ArgsQueuePurge.h"
+#include "qmf/org/apache/qpid/broker/ArgsQueuePurge.h"
 
 #include <iostream>
 #include <algorithm>
@@ -49,6 +49,7 @@ using qpid::management::Manageable;
 using qpid::management::Args;
 using std::for_each;
 using std::mem_fun;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 Queue::Queue(const string& _name, bool _autodelete, 
              MessageStore* const _store,
@@ -72,7 +73,7 @@ Queue::Queue(const string& _name, bool _autodelete,
 
         if (agent != 0)
         {
-            mgmtObject = new management::Queue (agent, this, parent, _name, _store != 0, _autodelete, _owner != 0);
+            mgmtObject = new _qmf::Queue(agent, this, parent, _name, _store != 0, _autodelete, _owner != 0);
 
             // Add the object to the management agent only if this queue is not durable.
             // If it's durable, we will add it later when the queue is assigned a persistenceId.
@@ -732,8 +733,8 @@ Manageable::status_t Queue::ManagementMethod (uint32_t methodId, Args& args, str
 
     switch (methodId)
     {
-    case management::Queue::METHOD_PURGE :
-      management::ArgsQueuePurge iargs = dynamic_cast<const management::ArgsQueuePurge&>(args);
+    case _qmf::Queue::METHOD_PURGE :
+        _qmf::ArgsQueuePurge& iargs = (_qmf::ArgsQueuePurge&) args;
         purge (iargs.i_request);
         status = Manageable::STATUS_OK;
         break;
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 1cf33b665f..f9f249cda8 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -31,7 +31,7 @@
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Queue.h"
+#include "qmf/org/apache/qpid/broker/Queue.h"
 #include "qpid/framing/amqp_types.h"
 
 #include <boost/shared_ptr.hpp>
@@ -87,7 +87,7 @@ namespace qpid {
             QueueBindings bindings;
             boost::shared_ptr<Exchange> alternateExchange;
             framing::SequenceNumber sequence;
-            management::Queue* mgmtObject;
+            qmf::org::apache::qpid::broker::Queue* mgmtObject;
 
             void push(boost::intrusive_ptr<Message>& msg);
             void setPolicy(std::auto_ptr<QueuePolicy> policy);
diff --git a/qpid/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
index 027f8a212d..d0e75849d8 100644
--- a/qpid/cpp/src/qpid/broker/SessionState.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
@@ -44,6 +44,7 @@ using qpid::management::ManagementAgent;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 SessionState::SessionState(
     Broker& b, SessionHandler& h, const SessionId& id, const SessionState::Configuration& config) 
@@ -60,7 +61,8 @@ SessionState::SessionState(
     if (parent != 0) {
         ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
         if (agent != 0) {
-            mgmtObject = new management::Session (agent, this, parent, getId().getName());
+            mgmtObject = new _qmf::Session
+                (agent, this, parent, getId().getName());
             mgmtObject->set_attached (0);
             mgmtObject->set_detachedLifespan (0);
             agent->addObject (mgmtObject);
@@ -127,15 +129,14 @@ Manageable::status_t SessionState::ManagementMethod (uint32_t methodId,
 
     switch (methodId)
     {
-      case management::Session::METHOD_DETACH :
-        if (handler != 0)
-        {
+    case _qmf::Session::METHOD_DETACH :
+        if (handler != 0) {
             handler->sendDetach();
         }
         status = Manageable::STATUS_OK;
         break;
 
-      case management::Session::METHOD_CLOSE :
+    case _qmf::Session::METHOD_CLOSE :
         /*
           if (handler != 0)
           {
@@ -145,8 +146,8 @@ Manageable::status_t SessionState::ManagementMethod (uint32_t methodId,
           break;
         */
 
-      case management::Session::METHOD_SOLICITACK :
-      case management::Session::METHOD_RESETLIFESPAN :
+    case _qmf::Session::METHOD_SOLICITACK :
+    case _qmf::Session::METHOD_RESETLIFESPAN :
         status = Manageable::STATUS_NOT_IMPLEMENTED;
         break;
     }
diff --git a/qpid/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h
index 83d79a617d..e424559228 100644
--- a/qpid/cpp/src/qpid/broker/SessionState.h
+++ b/qpid/cpp/src/qpid/broker/SessionState.h
@@ -27,7 +27,7 @@
 #include "qpid/framing/SequenceSet.h"
 #include "qpid/sys/Time.h"
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Session.h"
+#include "qmf/org/apache/qpid/broker/Session.h"
 #include "SessionAdapter.h"
 #include "DeliveryAdapter.h"
 #include "IncompleteMessageList.h"
@@ -122,7 +122,7 @@ class SessionState : public qpid::SessionState,
     MessageBuilder msgBuilder;
     IncompleteMessageList incomplete;
     IncompleteMessageList::CompletionListener enqueuedOp;
-    management::Session* mgmtObject;
+    qmf::org::apache::qpid::broker::Session* mgmtObject;
 
   friend class SessionManager;
 };
diff --git a/qpid/cpp/src/qpid/broker/System.cpp b/qpid/cpp/src/qpid/broker/System.cpp
index d562c43069..7b5e843e90 100644
--- a/qpid/cpp/src/qpid/broker/System.cpp
+++ b/qpid/cpp/src/qpid/broker/System.cpp
@@ -27,6 +27,7 @@
 using qpid::management::ManagementAgent;
 using namespace qpid::broker;
 using namespace std;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 System::System (string _dataDir) : mgmtObject(0)
 {
@@ -62,7 +63,7 @@ System::System (string _dataDir) : mgmtObject(0)
             }
         }
 
-        mgmtObject = new management::System (agent, this, systemId);
+        mgmtObject = new _qmf::System (agent, this, systemId);
         struct utsname _uname;
         if (uname (&_uname) == 0)
         {
diff --git a/qpid/cpp/src/qpid/broker/System.h b/qpid/cpp/src/qpid/broker/System.h
index ef7c6ba73b..42a816e095 100644
--- a/qpid/cpp/src/qpid/broker/System.h
+++ b/qpid/cpp/src/qpid/broker/System.h
@@ -21,7 +21,7 @@
 //
 
 #include "qpid/management/Manageable.h"
-#include "qpid/management/System.h"
+#include "qmf/org/apache/qpid/broker/System.h"
 #include <boost/shared_ptr.hpp>
 #include <string>
 
@@ -32,7 +32,7 @@ class System : public management::Manageable
 {
   private:
 
-    management::System* mgmtObject;
+    qmf::org::apache::qpid::broker::System* mgmtObject;
 
   public:
 
diff --git a/qpid/cpp/src/qpid/broker/TopicExchange.cpp b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
index 48d6e88503..787cf9637c 100644
--- a/qpid/cpp/src/qpid/broker/TopicExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
@@ -24,6 +24,7 @@
 using namespace qpid::broker;
 using namespace qpid::framing;
 using namespace qpid::sys;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 // TODO aconway 2006-09-20: More efficient matching algorithm.
 // Areas for improvement:
@@ -139,7 +140,7 @@ bool TopicExchange::bind(Queue::shared_ptr queue, const string& routingKey, cons
         bindings[routingPattern].push_back(binding);
         if (mgmtExchange != 0) {
             mgmtExchange->inc_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->inc_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->inc_bindingCount();
         }
         return true;
     }
@@ -160,7 +161,7 @@ bool TopicExchange::unbind(Queue::shared_ptr queue, const string& routingKey, co
     if(qv.empty()) bindings.erase(bi);
     if (mgmtExchange != 0) {
         mgmtExchange->dec_bindingCount();
-        ((management::Queue*) queue->GetManagementObject())->dec_bindingCount();
+        ((_qmf::Queue*) queue->GetManagementObject())->dec_bindingCount();
     }
     return true;
 }
diff --git a/qpid/cpp/src/qpid/broker/Vhost.cpp b/qpid/cpp/src/qpid/broker/Vhost.cpp
index c0eb6f03ed..4d9d3bb604 100644
--- a/qpid/cpp/src/qpid/broker/Vhost.cpp
+++ b/qpid/cpp/src/qpid/broker/Vhost.cpp
@@ -22,6 +22,7 @@
 
 using namespace qpid::broker;
 using qpid::management::ManagementAgent;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 Vhost::Vhost (management::Manageable* parentBroker) : mgmtObject(0)
 {
@@ -31,7 +32,7 @@ Vhost::Vhost (management::Manageable* parentBroker) : mgmtObject(0)
 
         if (agent != 0)
         {
-            mgmtObject = new management::Vhost (agent, this, parentBroker, "/");
+            mgmtObject = new _qmf::Vhost(agent, this, parentBroker, "/");
             agent->addObject (mgmtObject, 0x1000000000000003LL);
         }
     }
diff --git a/qpid/cpp/src/qpid/broker/Vhost.h b/qpid/cpp/src/qpid/broker/Vhost.h
index bdc64e71be..59c0d4f959 100644
--- a/qpid/cpp/src/qpid/broker/Vhost.h
+++ b/qpid/cpp/src/qpid/broker/Vhost.h
@@ -21,7 +21,7 @@
 //
 
 #include "qpid/management/Manageable.h"
-#include "qpid/management/Vhost.h"
+#include "qmf/org/apache/qpid/broker/Vhost.h"
 #include <boost/shared_ptr.hpp>
 
 namespace qpid { 
@@ -31,7 +31,7 @@ class Vhost : public management::Manageable
 {
   private:
 
-    management::Vhost* mgmtObject;
+    qmf::org::apache::qpid::broker::Vhost* mgmtObject;
 
   public:
 
diff --git a/qpid/cpp/src/qpid/broker/XmlExchange.cpp b/qpid/cpp/src/qpid/broker/XmlExchange.cpp
index b51791796d..5095e4a564 100644
--- a/qpid/cpp/src/qpid/broker/XmlExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/XmlExchange.cpp
@@ -40,6 +40,7 @@
 using namespace qpid::framing;
 using namespace qpid::sys;
 using qpid::management::Manageable;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 namespace qpid {
 namespace broker {
@@ -92,7 +93,7 @@ bool XmlExchange::bind(Queue::shared_ptr queue, const string& routingKey, const
 	    
 	    if (mgmtExchange != 0) {
 	        mgmtExchange->inc_bindingCount();
-		((management::Queue*) queue->GetManagementObject())->inc_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->inc_bindingCount();
 	    }
 	    return true;
 	} else {
@@ -113,7 +114,7 @@ bool XmlExchange::unbind(Queue::shared_ptr queue, const string& routingKey, cons
     if (bindingsMap[routingKey].remove_if(MatchQueue(queue))) {
         if (mgmtExchange != 0) {
             mgmtExchange->dec_bindingCount();
-            ((management::Queue*) queue->GetManagementObject())->dec_bindingCount();
+            ((_qmf::Queue*) queue->GetManagementObject())->dec_bindingCount();
         }
         return true;
     } else {
diff --git a/qpid/cpp/src/qpid/management/ManagementBroker.cpp b/qpid/cpp/src/qpid/management/ManagementBroker.cpp
index bb36841965..3ae98e8264 100644
--- a/qpid/cpp/src/qpid/management/ManagementBroker.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementBroker.cpp
@@ -39,6 +39,7 @@ using namespace qpid::management;
 using namespace qpid::broker;
 using namespace qpid::sys;
 using namespace std;
+namespace _qmf = qmf::org::apache::qpid::broker;
 
 Mutex            ManagementAgent::Singleton::lock;
 bool             ManagementAgent::Singleton::disabled = false;
@@ -113,7 +114,8 @@ ManagementBroker::~ManagementBroker ()
     }
 }
 
-void ManagementBroker::configure(string _dataDir, uint16_t _interval, broker::Broker* _broker, int _threads)
+void ManagementBroker::configure(string _dataDir, uint16_t _interval,
+                                 qpid::broker::Broker* _broker, int _threads)
 {
     dataDir        = _dataDir;
     interval       = _interval;
@@ -170,8 +172,8 @@ void ManagementBroker::writeData ()
     }
 }
 
-void ManagementBroker::setExchange (broker::Exchange::shared_ptr _mexchange,
-                                    broker::Exchange::shared_ptr _dexchange)
+void ManagementBroker::setExchange (qpid::broker::Exchange::shared_ptr _mexchange,
+                                    qpid::broker::Exchange::shared_ptr _dexchange)
 {
     mExchange = _mexchange;
     dExchange = _dexchange;
@@ -261,7 +263,7 @@ bool ManagementBroker::CheckHeader (Buffer& buf, uint8_t *opcode, uint32_t *seq)
 
 void ManagementBroker::SendBuffer (Buffer&  buf,
                                    uint32_t length,
-                                   broker::Exchange::shared_ptr exchange,
+                                   qpid::broker::Exchange::shared_ptr exchange,
                                    string   routingKey)
 {
     if (exchange.get() == 0)
@@ -448,7 +450,7 @@ void ManagementBroker::handleMethodRequestLH (Buffer& inBuffer, string replyToKe
     EncodeHeader(outBuffer, 'm', sequence);
 
     if (acl != 0) {
-        string userId = ((const broker::ConnectionState*) connToken)->getUserId();
+        string userId = ((const qpid::broker::ConnectionState*) connToken)->getUserId();
         std::map<acl::Property, string> params;
         params[acl::SCHEMAPACKAGE] = packageName;
         params[acl::SCHEMACLASS]   = className;
@@ -748,7 +750,7 @@ void ManagementBroker::handleAttachRequestLH (Buffer& inBuffer, string replyToKe
     agent->objIdBank  = assignedBank;
     agent->routingKey = replyToKey;
     agent->connectionRef = connectionRef;
-    agent->mgmtObject = new management::Agent (this, agent);
+    agent->mgmtObject = new _qmf::Agent (this, agent);
     agent->mgmtObject->set_connectionRef(agent->connectionRef);
     agent->mgmtObject->set_label        (label);
     agent->mgmtObject->set_registeredTo (broker->GetManagementObject()->getObjectId());
@@ -831,7 +833,7 @@ bool ManagementBroker::authorizeAgentMessageLH(Message& msg)
         if (acl == 0)
             return true;
 
-        string  userId = ((const broker::ConnectionState*) msg.getPublisher())->getUserId();
+        string  userId = ((const qpid::broker::ConnectionState*) msg.getPublisher())->getUserId();
         string  packageName;
         string  className;
         uint8_t hash[16];
diff --git a/qpid/cpp/src/qpid/management/ManagementBroker.h b/qpid/cpp/src/qpid/management/ManagementBroker.h
index e3b5504752..23fba74b83 100644
--- a/qpid/cpp/src/qpid/management/ManagementBroker.h
+++ b/qpid/cpp/src/qpid/management/ManagementBroker.h
@@ -30,7 +30,7 @@
 #include "qpid/agent/ManagementAgent.h"
 #include "ManagementObject.h"
 #include "Manageable.h"
-#include "qpid/management/Agent.h"
+#include "qmf/org/apache/qpid/broker/Agent.h"
 #include <qpid/framing/AMQFrame.h>
 
 namespace qpid {
@@ -47,10 +47,10 @@ class ManagementBroker : public ManagementAgent
     ManagementBroker ();
     virtual ~ManagementBroker ();
 
-    void configure       (std::string dataDir, uint16_t interval, broker::Broker* broker, int threadPoolSize);
+    void configure       (std::string dataDir, uint16_t interval, qpid::broker::Broker* broker, int threadPoolSize);
     void setInterval     (uint16_t _interval) { interval = _interval; }
-    void setExchange     (broker::Exchange::shared_ptr mgmtExchange,
-                          broker::Exchange::shared_ptr directExchange);
+    void setExchange     (qpid::broker::Exchange::shared_ptr mgmtExchange,
+                          qpid::broker::Exchange::shared_ptr directExchange);
     int  getMaxThreads   () { return threadPoolSize; }
     void RegisterClass   (std::string packageName,
                           std::string className,
@@ -59,7 +59,7 @@ class ManagementBroker : public ManagementAgent
     ObjectId addObject   (ManagementObject* object,
                           uint64_t          persistId = 0);
     void clientAdded     (void);
-    bool dispatchCommand (broker::Deliverable&       msg,
+    bool dispatchCommand (qpid::broker::Deliverable&       msg,
                           const std::string&         routingKey,
                           const framing::FieldTable* args);
 
@@ -71,7 +71,7 @@ class ManagementBroker : public ManagementAgent
   private:
     friend class ManagementAgent;
 
-    struct Periodic : public broker::TimerTask
+    struct Periodic : public qpid::broker::TimerTask
     {
         ManagementBroker& broker;
 
@@ -88,7 +88,7 @@ class ManagementBroker : public ManagementAgent
         uint32_t          objIdBank;
         std::string       routingKey;
         ObjectId          connectionRef;
-        Agent*            mgmtObject;
+        qmf::org::apache::qpid::broker::Agent*    mgmtObject;
         ManagementObject* GetManagementObject (void) const { return mgmtObject; }
         virtual ~RemoteAgent ();
     };
@@ -154,12 +154,12 @@ class ManagementBroker : public ManagementAgent
     framing::Uuid                uuid;
     sys::Mutex                   addLock;
     sys::Mutex                   userLock;
-    broker::Timer                timer;
-    broker::Exchange::shared_ptr mExchange;
-    broker::Exchange::shared_ptr dExchange;
+    qpid::broker::Timer                timer;
+    qpid::broker::Exchange::shared_ptr mExchange;
+    qpid::broker::Exchange::shared_ptr dExchange;
     std::string                  dataDir;
     uint16_t                     interval;
-    broker::Broker*              broker;
+    qpid::broker::Broker*              broker;
     uint16_t                     bootSequence;
     uint32_t                     nextObjectId;
     uint32_t                     brokerBank;
@@ -178,12 +178,12 @@ class ManagementBroker : public ManagementAgent
     bool CheckHeader        (framing::Buffer& buf, uint8_t *opcode, uint32_t *seq);
     void SendBuffer         (framing::Buffer&             buf,
                              uint32_t                     length,
-                             broker::Exchange::shared_ptr exchange,
+                             qpid::broker::Exchange::shared_ptr exchange,
                              std::string                  routingKey);
     void moveNewObjectsLH();
 
-    bool authorizeAgentMessageLH(broker::Message& msg);
-    void dispatchAgentCommandLH(broker::Message& msg);
+    bool authorizeAgentMessageLH(qpid::broker::Message& msg);
+    void dispatchAgentCommandLH(qpid::broker::Message& msg);
 
     PackageMap::iterator FindOrAddPackageLH(std::string name);
     void AddClass(PackageMap::iterator         pIter,
@@ -208,9 +208,9 @@ class ManagementBroker : public ManagementAgent
     void handleClassIndLH       (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
     void handleSchemaRequestLH  (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
     void handleSchemaResponseLH (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
-    void handleAttachRequestLH  (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const broker::ConnectionToken* connToken);
+    void handleAttachRequestLH  (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const qpid::broker::ConnectionToken* connToken);
     void handleGetQueryLH       (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence);
-    void handleMethodRequestLH  (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const broker::ConnectionToken* connToken);
+    void handleMethodRequestLH  (framing::Buffer& inBuffer, std::string replyToKey, uint32_t sequence, const qpid::broker::ConnectionToken* connToken);
 
     size_t ValidateSchema(framing::Buffer&);
     sys::Mutex& getMutex();
diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml
index 79dadf8759..2542ccff44 100644
--- a/qpid/specs/management-schema.xml
+++ b/qpid/specs/management-schema.xml
@@ -1,4 +1,4 @@
-<schema package="qpid">
+<schema package="org.apache.qpid.broker">
 
 <!--
   Licensed to the Apache Software Foundation (ASF) under one