QPID-1174 Remote Management Agent for management of external components

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

3 files changed, 3 insertions, 10 deletions

diff --git a/qpid/cpp/managementgen/main.py b/qpid/cpp/managementgen/main.py
index 87ef3d5298..4459177a53 100755
--- a/qpid/cpp/managementgen/main.py
+++ b/qpid/cpp/managementgen/main.py
@@ -28,9 +28,6 @@ usage  = "usage: %prog [options] schema-document type-document template-director
 parser = OptionParser (usage=usage)
 parser.add_option ("-m", "--makefile", dest="makefile", metavar="FILE",
                    help="Makefile fragment")
-parser.add_option ("-i", "--include-prefix", dest="include_prefix", metavar="PATH",
-                   default="qpid/management/",
-                   help="Prefix for #include of generated headers in generated source, default: qpid/management/")
 
 (opts, args) = parser.parse_args ()
 
@@ -42,9 +39,6 @@ typefile    = args[1]
 templatedir = args[2]
 outdir      = args[3]
 
-if opts.include_prefix == ".":
-  opts.include_prefix = None
-
 gen    = Generator     (outdir,   templatedir)
 schema = PackageSchema (typefile, schemafile, opts)
 
diff --git a/qpid/cpp/managementgen/schema.py b/qpid/cpp/managementgen/schema.py
index 4f5dc216ab..921c1bf01f 100755
--- a/qpid/cpp/managementgen/schema.py
+++ b/qpid/cpp/managementgen/schema.py
@@ -890,8 +890,7 @@ class SchemaClass:
   def genMethodArgIncludes (self, stream, variables):
     for method in self.methods:
       if method.getArgCount () > 0:
-        stream.write ("#include \"" + (self.options.include_prefix or "") +\
-                      "Args" + method.getFullName () + ".h\"\n")
+        stream.write ("#include \"Args" + method.getFullName () + ".h\"\n")
 
   def genMethodCount (self, stream, variables):
     stream.write ("%d" % len (self.methods))
@@ -1040,7 +1039,7 @@ class PackageSchema:
 
   def genClassIncludes (self, stream, variables):
     for _class in self.classes:
-      stream.write ("#include \"qpid/management/")
+      stream.write ("#include \"")
       _class.genNameCap (stream, variables)
       stream.write (".h\"\n")
 
diff --git a/qpid/cpp/managementgen/templates/Package.cpp b/qpid/cpp/managementgen/templates/Package.cpp
index 8bb2d42c47..15e7fc15ec 100644
--- a/qpid/cpp/managementgen/templates/Package.cpp
+++ b/qpid/cpp/managementgen/templates/Package.cpp
@@ -20,7 +20,7 @@
 
 /*MGEN:Root.Disclaimer*/
 
-#include "qpid/management/Package/*MGEN:Schema.PackageNameCap*/.h"
+#include "Package/*MGEN:Schema.PackageNameCap*/.h"
 /*MGEN:Schema.ClassIncludes*/
 
 using namespace qpid::management;