QMF Engine updates:

  - Connected console handler callbacks
  - Added string representations for a number of object classes
  - Added a feature that completes query requests sent to disconnected agents


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

3 files changed, 8 insertions, 1 deletions

diff --git a/cpp/include/qmf/engine/Console.h b/cpp/include/qmf/engine/Console.h
index 49cf41f2bc..f53f351760 100644
--- a/cpp/include/qmf/engine/Console.h
+++ b/cpp/include/qmf/engine/Console.h
@@ -94,12 +94,14 @@ namespace engine {
         EventKind       kind;
         AgentProxy*     agent;          // (AGENT_[ADDED|DELETED|HEARTBEAT])
         char*           name;           // (NEW_PACKAGE)
-        SchemaClassKey* classKey;       // (NEW_CLASS)
+        const SchemaClassKey* classKey; // (NEW_CLASS)
         Object*         object;         // (OBJECT_UPDATE)
         void*           context;        // (OBJECT_UPDATE)
         Event*          event;          // (EVENT_RECEIVED)
         uint64_t        timestamp;      // (AGENT_HEARTBEAT)
         QueryResponse*  queryResponse;  // (QUERY_COMPLETE)
+        bool            hasProps;
+        bool            hasStats;
     };
 
     /**
@@ -136,6 +138,8 @@ namespace engine {
         const char* getLabel() const;
 
     private:
+        friend struct StaticContext;
+        friend struct QueryContext;
         friend struct AgentProxyImpl;
         friend class BrokerProxyImpl;
         AgentProxy(AgentProxyImpl* impl);
@@ -219,6 +223,7 @@ namespace engine {
     private:
         friend class BrokerProxyImpl;
         friend struct AgentProxyImpl;
+        friend struct StaticContext;
         ConsoleImpl* impl;
     };
 }
diff --git a/cpp/include/qmf/engine/ObjectId.h b/cpp/include/qmf/engine/ObjectId.h
index a4b868b578..b71473a799 100644
--- a/cpp/include/qmf/engine/ObjectId.h
+++ b/cpp/include/qmf/engine/ObjectId.h
@@ -38,6 +38,7 @@ namespace engine {
         uint32_t getObjectNumHi() const;
         uint32_t getObjectNumLo() const;
         bool isDurable() const;
+        const char* str() const;
 
         bool operator==(const ObjectId& other) const;
         bool operator<(const ObjectId& other) const;
diff --git a/cpp/include/qmf/engine/Schema.h b/cpp/include/qmf/engine/Schema.h
index fceb29990d..16f11a83f9 100644
--- a/cpp/include/qmf/engine/Schema.h
+++ b/cpp/include/qmf/engine/Schema.h
@@ -142,6 +142,7 @@ namespace engine {
         const char* getPackageName() const;
         const char* getClassName() const;
         const uint8_t* getHash() const;
+        const char* asString() const;
 
         bool operator==(const SchemaClassKey& other) const;
         bool operator<(const SchemaClassKey& other) const;