Patch from https://issues.apache.org/jira/browse/QPID-722 by Ted Ross:

Two changes in this patch:

1) Management object IDs are now persistent for persistent (durable) objects. This is required to provide continuity of historical management data across broker restarts. The format of object IDs now indicates whether they are transient or persistent. The upper bit (bit 63) is 0 for transient IDs and 1 for persistent IDs.

2) Changes have been made to the management code generator in preparation for allowing it to be used by outside projects that wish to use the broker Plugin API for management access.

File-by-file notes:

M python/mgmt-cli/managementdata.py

    Enhanced user-friendly display of 64-bit object IDs to
    differentiate between persistent IDs and non-persistent IDs.

M cpp/src/Makefile.am

    Changed command line format for call to the management code
    generator.

M cpp/src/qpid/broker/Broker.cpp
M cpp/src/qpid/broker/Vhost.cpp
M cpp/src/qpid/broker/Queue.cpp

    Updated calls to ManagementAgent::addObject to use the new support
    for persistent IDs, ensuring that the management object IDs for
    persistent objects are themselves persistent.

M cpp/src/qpid/management/ManagementAgent.h
M cpp/src/qpid/management/ManagementAgent.cpp

    Added support (using defaulted arguments) to
    ManagementAgent::addObject for persistent object IDs

M cpp/managementgen/generate.py
M cpp/managementgen/schema.py
M cpp/managementgen/main.py

    Added the ability for templates to set variables to be used during
    code generation.

    Makefile fragment is now generated using a template rather than
    hard-code. This was done to help non-qpid code to use the code
    generator for management-via-qpid support.

M cpp/managementgen/templates/Args.h
M cpp/managementgen/templates/Class.cpp
M cpp/managementgen/templates/Class.h

    Use a generator variable to define the comment prefix.

A cpp/managementgen/templates/Makefile.mk

    New template for the qpid makefile fragment. 


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

1 files changed, 12 insertions, 17 deletions

diff --git a/cpp/managementgen/main.py b/cpp/managementgen/main.py
index ddf18ef873..de8ce4cbe6 100755
--- a/cpp/managementgen/main.py
+++ b/cpp/managementgen/main.py
@@ -24,32 +24,27 @@ from generate import Generator
 from optparse import OptionParser
 
 # Set command line options
-parser = OptionParser ()
-parser.add_option ("-o", "--outDir", dest="outdir", metavar="DIR",
-                   help="Destination directory for generated files")
-parser.add_option ("-t", "--typeFile", dest="typefile", metavar="FILE",
-                   help="Schema type document (XML file)")
-parser.add_option ("-s", "--schemaFile", dest="schemafile", metavar="FILE",
-                   help="Schema defintion document (XML file)")
-parser.add_option ("-i", "--templateDir", dest="templatedir", metavar="DIR",
-                   help="Directory where template files can be found")
+usage  = "usage: %prog [options] schema-document type-document template-directory out-directory"
+parser = OptionParser (usage=usage)
 parser.add_option ("-m", "--makefile", dest="makefile", metavar="FILE",
                    help="Makefile fragment")
 
 (opts, args) = parser.parse_args ()
 
-if opts.outdir      == None or \
-   opts.typefile    == None or \
-   opts.schemafile  == None or \
-   opts.templatedir == None:
-  parser.error ("Incorrect options, see --help for help")
+if len (args) < 4:
+  parser.error ("Too few arguments")
 
-gen    = Generator     (opts.outdir,   opts.templatedir)
-schema = PackageSchema (opts.typefile, opts.schemafile)
+schemafile  = args[0]
+typefile    = args[1]
+templatedir = args[2]
+outdir      = args[3]
+
+gen    = Generator     (outdir,   templatedir)
+schema = PackageSchema (typefile, schemafile)
 
 gen.makeClassFiles  ("Class.h",   schema)
 gen.makeClassFiles  ("Class.cpp", schema)
 gen.makeMethodFiles ("Args.h",    schema)
 
 if opts.makefile != None:
-  gen.makeMakeFile (opts.makefile)
+  gen.makeSingleFile ("Makefile.mk", opts.makefile, force=True)