Management cleanup - Synchronized with the spec on the Wiki

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

2 files changed, 9 insertions, 9 deletions

diff --git a/cpp/managementgen/templates/Class.cpp b/cpp/managementgen/templates/Class.cpp
index a1d5fed192..0fbb78b7f1 100644
--- a/cpp/managementgen/templates/Class.cpp
+++ b/cpp/managementgen/templates/Class.cpp
@@ -85,7 +85,7 @@ void /*MGEN:Class.NameCap*/::writeSchema (Buffer& buf)
 /*MGEN:Class.EventSchema*/
 }
 
-void /*MGEN:Class.NameCap*/::writeConfig (Buffer& buf)
+void /*MGEN:Class.NameCap*/::writeProperties (Buffer& buf)
 {
     sys::Mutex::ScopedLock mutex(accessLock);
     configChanged = false;
@@ -94,7 +94,7 @@ void /*MGEN:Class.NameCap*/::writeConfig (Buffer& buf)
 /*MGEN:Class.WriteConfig*/
 }
 
-void /*MGEN:Class.NameCap*/::writeInstrumentation (Buffer& buf, bool skipHeaders)
+void /*MGEN:Class.NameCap*/::writeStatistics (Buffer& buf, bool skipHeaders)
 {
     sys::Mutex::ScopedLock mutex(accessLock);
     instChanged = false;
diff --git a/cpp/managementgen/templates/Class.h b/cpp/managementgen/templates/Class.h
index 441571a174..aa01f8f105 100644
--- a/cpp/managementgen/templates/Class.h
+++ b/cpp/managementgen/templates/Class.h
@@ -44,13 +44,13 @@ class /*MGEN:Class.NameCap*/ : public ManagementObject
     // Statistics
 /*MGEN:Class.InstDeclarations*/
     // Private Methods
-    static void writeSchema   (qpid::framing::Buffer& buf);
-    void writeConfig          (qpid::framing::Buffer& buf);
-    void writeInstrumentation (qpid::framing::Buffer& buf,
-                               bool skipHeaders = false);
-    void doMethod             (std::string            methodName,
-                               qpid::framing::Buffer& inBuf,
-                               qpid::framing::Buffer& outBuf);
+    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);
     writeSchemaCall_t getWriteSchemaCall (void) { return writeSchema; }
 
 /*MGEN:Class.InstChangedStub*/