Renamed the python package for the qmf code generation as it conflicts

with the package for the qmf apis.


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

14 files changed, 19 insertions, 19 deletions

diff --git a/cpp/managementgen/Makefile.am b/cpp/managementgen/Makefile.am
index c9a20b06a7..f4f4b35e40 100644
--- a/cpp/managementgen/Makefile.am
+++ b/cpp/managementgen/Makefile.am
@@ -2,17 +2,17 @@ qmfpythondir = $(pythondir)
 dist_bin_SCRIPTS = \
 	qmf-gen
 nobase_qmfpython_DATA = \
-	qmf/__init__.py \
-	qmf/generate.py \
-	qmf/schema.py \
-	qmf/templates/Args.h \
-	qmf/templates/Class.cpp \
-	qmf/templates/Class.h \
-	qmf/templates/Event.cpp \
-	qmf/templates/Event.h \
-	qmf/templates/Makefile.mk \
-	qmf/templates/Package.cpp \
-	qmf/templates/Package.h \
-	qmf/management-types.xml
+	qmfgen/__init__.py \
+	qmfgen/generate.py \
+	qmfgen/schema.py \
+	qmfgen/templates/Args.h \
+	qmfgen/templates/Class.cpp \
+	qmfgen/templates/Class.h \
+	qmfgen/templates/Event.cpp \
+	qmfgen/templates/Event.h \
+	qmfgen/templates/Makefile.mk \
+	qmfgen/templates/Package.cpp \
+	qmfgen/templates/Package.h \
+	qmfgen/management-types.xml
 
 EXTRA_DIST = $(nobase_qmfpython_DATA)
diff --git a/cpp/managementgen/qmf-gen b/cpp/managementgen/qmf-gen
index d71097b4b4..21c42dc107 100755
--- a/cpp/managementgen/qmf-gen
+++ b/cpp/managementgen/qmf-gen
@@ -20,9 +20,9 @@
 #
 import sys
 import os
-from qmf.schema   import SchemaPackage, SchemaClass
-from qmf.generate import Generator
-from optparse     import OptionParser
+from qmfgen.schema   import SchemaPackage, SchemaClass
+from qmfgen.generate import Generator
+from optparse        import OptionParser
 
 dataPath = os.path.dirname(Generator.getModulePath())
 defaultTypeFile    = dataPath + "/management-types.xml"
diff --git a/cpp/managementgen/qmf/__init__.py b/cpp/managementgen/qmfgen/__init__.py
index caef6cc58b..caef6cc58b 100644
--- a/cpp/managementgen/qmf/__init__.py
+++ b/cpp/managementgen/qmfgen/__init__.py
diff --git a/cpp/managementgen/qmf/generate.py b/cpp/managementgen/qmfgen/generate.py
index 2f2d51a1e2..762af972e7 100755
--- a/cpp/managementgen/qmf/generate.py
+++ b/cpp/managementgen/qmfgen/generate.py
@@ -109,9 +109,9 @@ class Makefile:
     mdir = variables["mgenDir"]
     sdir = variables["specDir"]
     stream.write (mdir + "/qmf-gen \\\n")
-    stream.write ("    " + mdir + "/qmf/generate.py \\\n")
-    stream.write ("    " + mdir + "/qmf/schema.py \\\n")
-    stream.write ("    " + mdir + "/qmf/management-types.xml \\\n")
+    stream.write ("    " + mdir + "/qmfgen/generate.py \\\n")
+    stream.write ("    " + mdir + "/qmfgen/schema.py \\\n")
+    stream.write ("    " + mdir + "/qmfgen/management-types.xml \\\n")
     stream.write ("    " + sdir + "/management-schema.xml \\\n")
     first = True
     for template in self.templateFiles:
@@ -120,7 +120,7 @@ class Makefile:
         stream.write ("    ")
       else:
         stream.write (" \\\n    ")
-      stream.write (mdir + "/qmf/templates/" + template)
+      stream.write (mdir + "/qmfgen/templates/" + template)
 
   def genGenCppFiles (self, stream, variables):
     first = True
diff --git a/cpp/managementgen/qmf/management-types.xml b/cpp/managementgen/qmfgen/management-types.xml
index 626880afb3..626880afb3 100644
--- a/cpp/managementgen/qmf/management-types.xml
+++ b/cpp/managementgen/qmfgen/management-types.xml
diff --git a/cpp/managementgen/qmf/schema.py b/cpp/managementgen/qmfgen/schema.py
index 692a474992..692a474992 100755
--- a/cpp/managementgen/qmf/schema.py
+++ b/cpp/managementgen/qmfgen/schema.py
diff --git a/cpp/managementgen/qmf/templates/Args.h b/cpp/managementgen/qmfgen/templates/Args.h
index 074ccf9940..074ccf9940 100644
--- a/cpp/managementgen/qmf/templates/Args.h
+++ b/cpp/managementgen/qmfgen/templates/Args.h
diff --git a/cpp/managementgen/qmf/templates/Class.cpp b/cpp/managementgen/qmfgen/templates/Class.cpp
index 247e1090ff..247e1090ff 100644
--- a/cpp/managementgen/qmf/templates/Class.cpp
+++ b/cpp/managementgen/qmfgen/templates/Class.cpp
diff --git a/cpp/managementgen/qmf/templates/Class.h b/cpp/managementgen/qmfgen/templates/Class.h
index 7796914d51..7796914d51 100644
--- a/cpp/managementgen/qmf/templates/Class.h
+++ b/cpp/managementgen/qmfgen/templates/Class.h
diff --git a/cpp/managementgen/qmf/templates/Event.cpp b/cpp/managementgen/qmfgen/templates/Event.cpp
index cdb40c6d79..cdb40c6d79 100644
--- a/cpp/managementgen/qmf/templates/Event.cpp
+++ b/cpp/managementgen/qmfgen/templates/Event.cpp
diff --git a/cpp/managementgen/qmf/templates/Event.h b/cpp/managementgen/qmfgen/templates/Event.h
index b5c2a211d1..b5c2a211d1 100644
--- a/cpp/managementgen/qmf/templates/Event.h
+++ b/cpp/managementgen/qmfgen/templates/Event.h
diff --git a/cpp/managementgen/qmf/templates/Makefile.mk b/cpp/managementgen/qmfgen/templates/Makefile.mk
index 2b32c7c0f2..2b32c7c0f2 100644
--- a/cpp/managementgen/qmf/templates/Makefile.mk
+++ b/cpp/managementgen/qmfgen/templates/Makefile.mk
diff --git a/cpp/managementgen/qmf/templates/Package.cpp b/cpp/managementgen/qmfgen/templates/Package.cpp
index f6bd7f4654..f6bd7f4654 100644
--- a/cpp/managementgen/qmf/templates/Package.cpp
+++ b/cpp/managementgen/qmfgen/templates/Package.cpp
diff --git a/cpp/managementgen/qmf/templates/Package.h b/cpp/managementgen/qmfgen/templates/Package.h
index 0ad7060b9e..0ad7060b9e 100644
--- a/cpp/managementgen/qmf/templates/Package.h
+++ b/cpp/managementgen/qmfgen/templates/Package.h