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

4 files changed, 22 insertions, 22 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*/
diff --git a/cpp/src/qpid/management/ManagementBroker.cpp b/cpp/src/qpid/management/ManagementBroker.cpp
index 2f30aa4c0b..24d18875b6 100644
--- a/cpp/src/qpid/management/ManagementBroker.cpp
+++ b/cpp/src/qpid/management/ManagementBroker.cpp
@@ -299,11 +299,11 @@ void ManagementBroker::PeriodicProcessing (void)
         {
             Buffer msgBuffer (msgChars, BUFSIZE);
             EncodeHeader (msgBuffer, 'c');
-            object->writeConfig (msgBuffer);
+            object->writeProperties(msgBuffer);
 
             contentSize = BUFSIZE - msgBuffer.available ();
             msgBuffer.reset ();
-            routingKey = "mgmt." + uuid.str() + ".config." + object->getClassName ();
+            routingKey = "mgmt." + uuid.str() + ".prop." + object->getClassName ();
             SendBuffer (msgBuffer, contentSize, mExchange, routingKey);
         }
         
@@ -311,11 +311,11 @@ void ManagementBroker::PeriodicProcessing (void)
         {
             Buffer msgBuffer (msgChars, BUFSIZE);
             EncodeHeader (msgBuffer, 'i');
-            object->writeInstrumentation (msgBuffer);
+            object->writeStatistics(msgBuffer);
 
             contentSize = BUFSIZE - msgBuffer.available ();
             msgBuffer.reset ();
-            routingKey = "mgmt." + uuid.str () + ".inst." + object->getClassName ();
+            routingKey = "mgmt." + uuid.str () + ".stat." + object->getClassName ();
             SendBuffer (msgBuffer, contentSize, mExchange, routingKey);
         }
 
@@ -681,8 +681,8 @@ void ManagementBroker::handleGetQueryLH (Buffer& inBuffer, string replyToKey, ui
             uint32_t outLen;
 
             EncodeHeader (outBuffer, 'g', sequence);
-            object->writeConfig (outBuffer);
-            object->writeInstrumentation (outBuffer, true);
+            object->writeProperties(outBuffer);
+            object->writeStatistics(outBuffer, true);
             outLen = MA_BUFFER_SIZE - outBuffer.available ();
             outBuffer.reset ();
             SendBuffer (outBuffer, outLen, dExchange, replyToKey);
diff --git a/cpp/src/qpid/management/ManagementObject.h b/cpp/src/qpid/management/ManagementObject.h
index 1d54d606a4..38f72710de 100644
--- a/cpp/src/qpid/management/ManagementObject.h
+++ b/cpp/src/qpid/management/ManagementObject.h
@@ -86,13 +86,13 @@ class ManagementObject
     virtual ~ManagementObject () {}
 
     virtual writeSchemaCall_t getWriteSchemaCall (void) = 0;
-    virtual void writeConfig          (qpid::framing::Buffer& buf) = 0;
-    virtual void writeInstrumentation (qpid::framing::Buffer& buf,
-                                       bool skipHeaders = false) = 0;
-    virtual void doMethod             (std::string            methodName,
-                                       qpid::framing::Buffer& inBuf,
-                                       qpid::framing::Buffer& outBuf) = 0;
-    virtual void setReference(uint64_t objectId);
+    virtual void writeProperties(qpid::framing::Buffer& buf) = 0;
+    virtual void writeStatistics(qpid::framing::Buffer& buf,
+                                 bool skipHeaders = false) = 0;
+    virtual void doMethod       (std::string            methodName,
+                                 qpid::framing::Buffer& inBuf,
+                                 qpid::framing::Buffer& outBuf) = 0;
+    virtual void setReference   (uint64_t objectId);
 
     virtual std::string  getClassName   (void) = 0;
     virtual std::string  getPackageName (void) = 0;