svn commit: r719671 - in /incubator/qpid/trunk/qpid/cpp/managementgen: Makefile.am qmf-gen qmf/ qmfgen/ qmfgen/generate.py

[tr...@apache.org]

Author: tross
Date: Fri Nov 21 10:46:24 2008
New Revision: 719671

URL: http://svn.apache.org/viewvc?rev=719671&view=rev
Log:
Renamed the python package for the qmf code generation as it conflicts
with the package for the qmf apis.

Added:
    incubator/qpid/trunk/qpid/cpp/managementgen/qmfgen/
      - copied from r719569, incubator/qpid/trunk/qpid/cpp/managementgen/qmf/
Removed:
    incubator/qpid/trunk/qpid/cpp/managementgen/qmf/
Modified:
    incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am
    incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen
    incubator/qpid/trunk/qpid/cpp/managementgen/qmfgen/generate.py

Modified: incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am?rev=719671&r1=719670&r2=719671&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/Makefile.am Fri Nov 21 10:46:24 2008
@@ -2,17 +2,17 @@
 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)

Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen?rev=719671&r1=719670&r2=719671&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmf-gen Fri Nov 21 10:46:24 2008
@@ -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"

Modified: incubator/qpid/trunk/qpid/cpp/managementgen/qmfgen/generate.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/qmfgen/generate.py?rev=719671&r1=719569&r2=719671&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/qmfgen/generate.py (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/qmfgen/generate.py Fri Nov 21 10:46:24 2008
@@ -109,9 +109,9 @@
     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 @@
         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