You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2008/12/19 21:22:04 UTC

svn commit: r728132 [1/2] - in /qpid/trunk/qpid/cpp: ./ examples/ examples/qmf-console/ src/ src/qpid/console/ src/qpid/framing/ src/qpid/sys/ src/qpid/sys/posix/ src/tests/

Author: tross
Date: Fri Dec 19 12:22:03 2008
New Revision: 728132

URL: http://svn.apache.org/viewvc?rev=728132&view=rev
Log:
QPID-1412 - c++ implementation of the QMF client API

Added:
    qpid/trunk/qpid/cpp/examples/qmf-console/
    qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
    qpid/trunk/qpid/cpp/examples/qmf-console/console.cpp
    qpid/trunk/qpid/cpp/src/qmfc.mk
    qpid/trunk/qpid/cpp/src/qpid/console/
    qpid/trunk/qpid/cpp/src/qpid/console/Agent.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/Agent.h
    qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/Broker.h
    qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.h
    qpid/trunk/qpid/cpp/src/qpid/console/ConsoleListener.h
    qpid/trunk/qpid/cpp/src/qpid/console/Event.h
    qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/Object.h
    qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h
    qpid/trunk/qpid/cpp/src/qpid/console/Package.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/Package.h
    qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/Schema.h
    qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h
    qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/SessionManager.h
    qpid/trunk/qpid/cpp/src/qpid/console/Value.cpp
    qpid/trunk/qpid/cpp/src/qpid/console/Value.h
    qpid/trunk/qpid/cpp/src/tests/ConsoleTest.cpp
Modified:
    qpid/trunk/qpid/cpp/configure.ac
    qpid/trunk/qpid/cpp/examples/Makefile.am
    qpid/trunk/qpid/cpp/examples/makedist.mk
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.cpp
    qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h
    qpid/trunk/qpid/cpp/src/qpid/sys/SystemInfo.h
    qpid/trunk/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
    qpid/trunk/qpid/cpp/src/tests/Makefile.am

Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=728132&r1=728131&r2=728132&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Fri Dec 19 12:22:03 2008
@@ -379,6 +379,7 @@
   examples/request-response/Makefile
   examples/failover/Makefile
   examples/xml-exchange/Makefile
+  examples/qmf-console/Makefile
   managementgen/Makefile
   etc/Makefile
   src/Makefile

Modified: qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=728132&r1=728131&r2=728132&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/Makefile.am Fri Dec 19 12:22:03 2008
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-SUBDIRS = direct fanout pub-sub request-response failover
+SUBDIRS = direct fanout pub-sub request-response failover qmf-console
 if HAVE_XML
   SUBDIRS += xml-exchange
   broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module $(top_builddir)/src/.libs/xml.so"	

Modified: qpid/trunk/qpid/cpp/examples/makedist.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/makedist.mk?rev=728132&r1=728131&r2=728132&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/makedist.mk (original)
+++ qpid/trunk/qpid/cpp/examples/makedist.mk Fri Dec 19 12:22:03 2008
@@ -2,6 +2,8 @@
 AM_CXXFLAGS = $(WARNING_CFLAGS)
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/gen -I$(top_builddir)/src -I$(top_builddir)/src/gen
 CLIENT_LIB=$(top_builddir)/src/libqpidclient.la
+CONSOLE_LIB=$(top_builddir)/src/libqmfconsole.la
+MAKELDFLAG ?= qpidclient
 
 # Generate a simple non-automake Makefile for distribution.
 MAKEDIST=.libs/Makefile
@@ -10,7 +12,7 @@
 	mkdir -p .libs
 	@$(ECHO) CXX=$(CXX)                     > $(MAKEDIST)
 	@$(ECHO) CXXFLAGS=$(CXXFLAGS)           >> $(MAKEDIST)
-	@$(ECHO) LDFLAGS=-lqpidclient           >> $(MAKEDIST)
+	@$(ECHO) LDFLAGS=-l$(MAKELDFLAG)        >> $(MAKEDIST)
 	@$(ECHO)                                >> $(MAKEDIST)
 	@$(ECHO) all: $(noinst_PROGRAMS)       >> $(MAKEDIST)
 	@$(ECHO)                                >> $(MAKEDIST)

Added: qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am (added)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am Fri Dec 19 12:22:03 2008
@@ -0,0 +1,14 @@
+examplesdir=$(pkgdatadir)/examples/qmf-console
+
+MAKELDFLAG = qmfconsole
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=qmfc
+
+qmfc_SOURCES=console.cpp
+qmfc_LDADD=$(CONSOLE_LIB)
+
+examples_DATA= \
+	console.cpp \
+	$(MAKEDIST)
+

Added: qpid/trunk/qpid/cpp/examples/qmf-console/console.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/console.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/console.cpp (added)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/console.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,154 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/console/ConsoleListener.h"
+#include "qpid/console/SessionManager.h"
+#include "qpid/console/Value.h"
+#include <unistd.h>
+#include <cstdlib>
+#include <iostream>
+
+#include <sstream>
+
+using namespace std;
+using namespace qpid::console;
+using std::cout;
+using std::endl;
+
+class Listener : public ConsoleListener {
+public:
+    ~Listener() {}
+
+    void brokerConnected(const Broker& broker) {
+        cout << "brokerConnected: " << broker << endl;
+    }
+
+    void brokerDisconnected(const Broker& broker) {
+        cout << "brokerDisconnected: " << broker << endl;
+    }
+
+    void newPackage(const std::string& name) {
+        cout << "newPackage: " << name << endl;
+    }
+
+    void newClass(const ClassKey& classKey) {
+        cout << "newClass: key=" << classKey << endl;
+    }
+
+    void newAgent(const Agent& agent) {
+        cout << "newAgent: " << agent << endl;
+    }
+
+    void delAgent(const Agent& agent) {
+        cout << "delAgent: " << agent << endl;
+    }
+
+    void objectProps(Broker& broker, Object& object) {
+        cout << "objectProps: broker=" << broker << " object=" << object << endl;
+    }
+
+    void objectStats(Broker& broker, Object& object) {
+        cout << "objectStats: broker=" << broker << " object=" << object << endl;
+    }
+};
+
+
+//==============================================================
+// Main program
+//==============================================================
+int main_int(int /*argc*/, char** /*argv*/)
+{
+    //Listener listener;
+    qpid::client::ConnectionSettings settings;
+
+    cout << "Creating SessionManager" << endl;
+    SessionManager sm;
+    cout << "Adding broker" << endl;
+    Broker* broker;
+
+    broker = sm.addBroker(settings);
+
+    cout << "Package List:" << endl;
+    vector<string> packages;
+    sm.getPackages(packages);
+    for (vector<string>::iterator iter = packages.begin(); iter != packages.end(); iter++) {
+        cout << "    " << *iter << endl;
+        SessionManager::KeyVector classKeys;
+        sm.getClasses(classKeys, *iter);
+        for (SessionManager::KeyVector::iterator cIter = classKeys.begin();
+             cIter != classKeys.end(); cIter++)
+            cout << "        " << *cIter << endl;
+    }
+
+    Object::Vector list;
+    cout << "getting exchanges..." << endl;
+    sm.getObjects(list, "exchange");
+    cout << "   returned " << list.size() << " elements" << endl;
+
+    for (Object::Vector::iterator i = list.begin(); i != list.end(); i++) {
+        cout << "exchange: " << *i << endl;
+    }
+
+    list.clear();
+    cout << "getting queues..." << endl;
+    sm.getObjects(list, "queue");
+    cout << "   returned " << list.size() << " elements" << endl;
+
+    for (Object::Vector::iterator i = list.begin(); i != list.end(); i++) {
+        cout << "queue: " << *i << endl;
+        cout << "  bindingCount=" << i->attrUint("bindingCount") << endl;
+        cout << "  arguments=" << i->attrMap("arguments") << endl;
+    }
+
+    list.clear();
+    sm.getObjects(list, "broker");
+    if (list.size() == 1) {
+        Object& broker = *list.begin();
+
+        cout << "Broker: " << broker << endl;
+
+        Object::AttributeMap args;
+        MethodResponse result;
+        args["sequence"] = new UintValue(1);
+        args["body"] = new StringValue("Testing...");
+
+        cout << "Call echo method..." << endl;
+        broker.invokeMethod("echo", args, result);
+        cout << "Result: code=" << result.code << " text=" << result.text << endl;
+        for (Object::AttributeMap::iterator aIter = result.arguments.begin();
+             aIter != result.arguments.end(); aIter++) {
+            cout << "   Output Arg: " << aIter->first << " => " << aIter->second->str() << endl;
+        }
+    }
+
+    sm.delBroker(broker);
+    return 0;
+}
+
+int main(int argc, char** argv)
+{
+    try {
+        return main_int(argc, argv);
+    } catch(std::exception& e) {
+        cout << "Top Level Exception: " << e.what() << endl;
+    }
+}
+

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=728132&r1=728131&r2=728132&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Fri Dec 19 12:22:03 2008
@@ -179,6 +179,7 @@
 include cluster.mk
 include acl.mk
 include qmf.mk
+include qmfc.mk
 if HAVE_XML
 include xml.mk
 endif

Added: qpid/trunk/qpid/cpp/src/qmfc.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmfc.mk?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmfc.mk (added)
+++ qpid/trunk/qpid/cpp/src/qmfc.mk Fri Dec 19 12:22:03 2008
@@ -0,0 +1,50 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http:#www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# qmf console library makefile fragment, to be included in Makefile.am
+# 
+lib_LTLIBRARIES += libqmfconsole.la
+
+libqmfconsole_la_SOURCES = \
+  qpid/console/Agent.h \
+  qpid/console/Agent.cpp \
+  qpid/console/Broker.h \
+  qpid/console/Broker.cpp \
+  qpid/console/ClassKey.h \
+  qpid/console/ClassKey.cpp \
+  qpid/console/ConsoleListener.h \
+  qpid/console/Event.h \
+  qpid/console/Object.h \
+  qpid/console/Object.cpp \
+  qpid/console/ObjectId.h \
+  qpid/console/ObjectId.cpp \
+  qpid/console/Package.h \
+  qpid/console/Package.cpp \
+  qpid/console/Schema.h \
+  qpid/console/Schema.cpp \
+  qpid/console/SequenceManager.h \
+  qpid/console/SequenceManager.cpp \
+  qpid/console/SessionManager.h \
+  qpid/console/SessionManager.cpp \
+  qpid/console/Value.h \
+  qpid/console/Value.cpp
+
+libqmfconsole_la_LIBADD = libqpidclient.la
+

Added: qpid/trunk/qpid/cpp/src/qpid/console/Agent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Agent.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Agent.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Agent.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,30 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "Agent.h"
+
+std::ostream& qpid::console::operator<<(std::ostream& o, const Agent& agent)
+{
+    o << "Agent at bank " << agent.getBrokerBank() << "." << agent.getAgentBank() <<
+        " (" << agent.getLabel() << ")";
+    return o;
+}
+

Added: qpid/trunk/qpid/cpp/src/qpid/console/Agent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Agent.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Agent.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Agent.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,57 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_AGENT_H_
+#define _QPID_CONSOLE_AGENT_H_
+
+#include "Broker.h"
+
+namespace qpid {
+namespace console {
+
+    /**
+     *
+     * \ingroup qmfconsoleapi
+     */
+    class Agent {
+    public:
+        typedef std::vector<Agent*> Vector;
+
+        Agent(Broker* _broker, uint32_t _bank, const std::string& _label) :
+            broker(_broker), brokerBank(broker->getBrokerBank()),
+            agentBank(_bank), label(_label) {}
+        Broker* getBroker() const { return broker; }
+        uint32_t getBrokerBank() const { return brokerBank; }
+        uint32_t getAgentBank() const { return agentBank; }
+        const std::string& getLabel() const { return label; }
+
+    private:
+        Broker* broker;
+        const uint32_t brokerBank;
+        const uint32_t agentBank;
+        const std::string label;
+    };
+
+    std::ostream& operator<<(std::ostream& o, const Agent& agent);
+}
+}
+
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Broker.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,291 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "Broker.h"
+#include "Object.h"
+#include "Value.h"
+#include "SessionManager.h"
+#include "ConsoleListener.h"
+#include "qpid/log/Statement.h"
+#include "qpid/sys/SystemInfo.h"
+
+using namespace qpid::client;
+using namespace qpid::console;
+using namespace qpid::framing;
+using namespace qpid::sys;
+using namespace std;
+
+Broker::Broker(SessionManager& sm, ConnectionSettings& settings) : 
+    sessionManager(sm), connected(false), connectionSettings(settings),
+    reqsOutstanding(1), syncInFlight(false), topicBound(false), methodObject(0),
+    connThreadBody(*this), connThread(connThreadBody)
+{
+    string osName;
+    string nodeName;
+    string release;
+    string version;
+    string machine;
+
+    sys::SystemInfo::getSystemId(osName, nodeName, release, version, machine);
+    uint32_t pid = sys::SystemInfo::getParentProcessId();
+
+    stringstream text;
+
+    text << "qmfc-cpp-" << nodeName << "-" << pid;
+    amqpSessionId = string(text.str());
+
+    QPID_LOG(debug, "Broker::Broker: constructed, amqpSessionId=" << amqpSessionId);
+}
+
+Broker::~Broker()
+{
+}
+
+void Broker::encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq) const
+{
+    buf.putOctet('A');
+    buf.putOctet('M');
+    buf.putOctet('2');
+    buf.putOctet(opcode);
+    buf.putLong (seq);
+}
+
+bool Broker::checkHeader(framing::Buffer& buf, uint8_t *opcode, uint32_t *seq) const
+{
+    if (buf.getSize() < 8)
+        return false;
+
+    uint8_t h1 = buf.getOctet();
+    uint8_t h2 = buf.getOctet();
+    uint8_t h3 = buf.getOctet();
+
+    *opcode = buf.getOctet();
+    *seq    = buf.getLong();
+
+    return h1 == 'A' && h2 == 'M' && h3 == '2';
+}
+
+void Broker::received(client::Message& msg)
+{
+    string   data = msg.getData();
+    Buffer   inBuffer(const_cast<char*>(data.c_str()), data.size());
+    uint8_t  opcode;
+    uint32_t sequence;
+
+    if (checkHeader(inBuffer, &opcode, &sequence)) {
+        QPID_LOG(trace, "Broker::received: opcode=" << opcode << " seq=" << sequence);
+
+        if      (opcode == 'b') sessionManager.handleBrokerResp(this, inBuffer, sequence);
+        else if (opcode == 'p') sessionManager.handlePackageInd(this, inBuffer, sequence);
+        else if (opcode == 'z') sessionManager.handleCommandComplete(this, inBuffer, sequence);
+        else if (opcode == 'q') sessionManager.handleClassInd(this, inBuffer, sequence);
+        else if (opcode == 'm') sessionManager.handleMethodResp(this, inBuffer, sequence);
+        else if (opcode == 'h') sessionManager.handleHeartbeatInd(this, inBuffer, sequence);
+        else if (opcode == 'e') sessionManager.handleEventInd(this, inBuffer, sequence);
+        else if (opcode == 's') sessionManager.handleSchemaResp(this, inBuffer, sequence);
+        else if (opcode == 'c') sessionManager.handleContentInd(this, inBuffer, sequence, true, false);
+        else if (opcode == 'i') sessionManager.handleContentInd(this, inBuffer, sequence, false, true);
+        else if (opcode == 'g') sessionManager.handleContentInd(this, inBuffer, sequence, true, true);
+    }
+}
+
+void Broker::resetAgents()
+{
+    for (AgentMap::iterator iter = agents.begin(); iter != agents.end(); iter++) {
+        if (sessionManager.listener != 0)
+            sessionManager.listener->delAgent(*(iter->second));
+        delete iter->second;
+    }
+
+    agents.clear();
+    agents[0x0000000100000000LL] = new Agent(this, 0, "BrokerAgent");
+}
+
+void Broker::updateAgent(const Object& object)
+{
+    uint32_t brokerBank = object.attrUint("brokerBank");
+    uint32_t agentBank = object.attrUint("agentBank");
+    uint64_t agentKey = ((uint64_t) brokerBank << 32) | (uint64_t) agentBank;
+    AgentMap::iterator iter = agents.find(agentKey);
+
+    if (object.isDeleted()) {
+        if (iter != agents.end()) {
+            if (sessionManager.listener != 0)
+                sessionManager.listener->delAgent(*(iter->second));
+            delete iter->second;
+            agents.erase(iter);
+        }
+    } else {
+        if (iter == agents.end()) {
+            Agent* agent = new Agent(this, agentBank, object.attrString("label"));
+            agents[agentKey] = agent;
+            if (sessionManager.listener != 0)
+                sessionManager.listener->newAgent(*agent);
+        }
+    }
+}
+
+void Broker::ConnectionThread::run()
+{
+    static const int delayMin(1);
+    static const int delayMax(128);
+    static const int delayFactor(2);
+    int delay(delayMin);
+    string dest("qmfc");
+
+    sessionId.generate();
+    queueName << "qmfc-" << sessionId;
+
+    while (true) {
+        try {
+            broker.topicBound = false;
+            broker.reqsOutstanding = 1;
+            connection.open(broker.connectionSettings);
+            session = connection.newSession(queueName.str());
+            subscriptions = new client::SubscriptionManager(session);
+
+            session.queueDeclare(arg::queue=queueName.str(), arg::autoDelete=true,
+                                 arg::exclusive=true);
+            session.exchangeBind(arg::exchange="amq.direct", arg::queue=queueName.str(),
+                                 arg::bindingKey=queueName.str());
+
+            subscriptions->setAcceptMode(ACCEPT_MODE_NONE);
+            subscriptions->setAcquireMode(ACQUIRE_MODE_PRE_ACQUIRED);
+            subscriptions->subscribe(broker, queueName.str(), dest);
+            subscriptions->setFlowControl(dest, FlowControl::unlimited());
+            {
+                Mutex::ScopedLock _lock(connLock);
+                operational = true;
+                broker.resetAgents();
+                broker.connected = true;
+                broker.sessionManager.handleBrokerConnect(&broker);
+                broker.sessionManager.startProtocol(&broker);
+                try {
+                    Mutex::ScopedUnlock _unlock(connLock);
+                    subscriptions->run();
+                } catch (std::exception) {}
+                
+                operational = false;
+                broker.connected = false;
+                broker.sessionManager.handleBrokerDisconnect(&broker);
+            }
+            delay = delayMin;
+            delete subscriptions;
+            subscriptions = 0;
+            session.close();
+        } catch (std::exception &e) {
+            QPID_LOG(debug, "  outer exception: " << e.what());
+            if (delay < delayMax)
+                delay *= delayFactor;
+        }
+
+        ::sleep(delay);
+    }
+}
+
+Broker::ConnectionThread::~ConnectionThread()
+{
+    if (subscriptions != 0) {
+        delete subscriptions;
+    }
+}
+
+void Broker::ConnectionThread::sendBuffer(Buffer& buf, uint32_t length,
+                                          const string& exchange, const string& routingKey)
+{
+    {
+        Mutex::ScopedLock _lock(connLock);
+        if (!operational)
+            return;
+    }
+
+    client::Message msg;
+    string  data;
+
+    buf.getRawData(data, length);
+    msg.getDeliveryProperties().setRoutingKey(routingKey);
+    msg.getMessageProperties().setReplyTo(ReplyTo("amq.direct", queueName.str()));
+    msg.setData(data);
+    try {
+        session.messageTransfer(arg::content=msg, arg::destination=exchange);
+    } catch(std::exception&) {}
+}
+
+void Broker::ConnectionThread::bindExchange(const std::string& exchange, const std::string& key)
+{
+    {
+        Mutex::ScopedLock _lock(connLock);
+        if (!operational)
+            return;
+    }
+
+    QPID_LOG(debug, "Broker::ConnectionThread::bindExchange: exchange=" << exchange << " key=" << key);
+    session.exchangeBind(arg::exchange=exchange, arg::queue=queueName.str(),
+                          arg::bindingKey=key);
+}
+
+void Broker::waitForStable()
+{
+    Mutex::ScopedLock l(lock);
+    if (reqsOutstanding == 0)
+        return;
+    syncInFlight = true;
+    while (reqsOutstanding != 0) {
+        cond.wait(lock);  // TODO: put timeout delay in here!
+    }
+}
+
+void Broker::incOutstanding()
+{
+    Mutex::ScopedLock l(lock);
+    reqsOutstanding++;
+}
+
+void Broker::decOutstanding()
+{
+    Mutex::ScopedLock l(lock);
+    reqsOutstanding--;
+    if (reqsOutstanding == 0) {
+        if (!topicBound) {
+            topicBound = true;
+            for (vector<string>::const_iterator iter = sessionManager.bindingKeyList.begin();
+                 iter != sessionManager.bindingKeyList.end(); iter++)
+                connThreadBody.bindExchange("qpid.management", *iter);
+        }
+        if (syncInFlight) {
+            syncInFlight = false;
+            cond.notify();
+        }
+    }
+}
+
+void Broker::appendAgents(Agent::Vector& agentlist) const
+{
+    for (AgentMap::const_iterator iter = agents.begin(); iter != agents.end(); iter++) {
+        agentlist.push_back(iter->second);
+    }
+}
+
+ostream& qpid::console::operator<<(ostream& o, const Broker& k)
+{
+    o << "Broker: " << k.connectionSettings.host << ":" << k.connectionSettings.port;
+    return o;
+}

Added: qpid/trunk/qpid/cpp/src/qpid/console/Broker.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Broker.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Broker.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Broker.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,129 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_BROKER_H_
+#define _QPID_CONSOLE_BROKER_H_
+
+#include "qpid/client/Connection.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/client/SubscriptionManager.h"
+#include "qpid/client/Session.h"
+#include "qpid/client/AsyncSession.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Mutex.h"
+#include "qpid/sys/Condition.h"
+#include "qpid/Url.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/Uuid.h"
+#include <string>
+#include <iostream>
+
+namespace qpid {
+namespace console {
+    class SessionManager;
+    class Agent;
+    class Object;
+
+    /**
+     *
+     * \ingroup qpidconsoleapi
+     */
+    class Broker : public client::MessageListener {
+    public:
+        Broker(SessionManager& sm, client::ConnectionSettings& settings);
+        ~Broker();
+        
+        bool isConnected() const { return connected; }
+        const std::string& getError() const { return error; }
+        const std::string& getSessionId() const { return amqpSessionId; }
+        const framing::Uuid& getBrokerId() const { return brokerId; }
+        uint32_t getBrokerBank() const { return 1; }
+        void addBinding(const std::string& key) {
+            connThreadBody.bindExchange("qpid.management", key);
+        }
+
+    private:
+        friend class SessionManager;
+        friend class Object;
+        typedef std::map<uint64_t,Agent*> AgentMap;
+        static const int SYNC_TIME = 60;
+
+        SessionManager& sessionManager;
+        AgentMap agents;
+        client::SubscriptionManager* subscription;
+        bool connected;
+        std::string error;
+        std::string amqpSessionId;
+        client::ConnectionSettings connectionSettings;
+        sys::Mutex lock;
+        sys::Condition cond;
+        framing::Uuid brokerId;
+        uint32_t reqsOutstanding;
+        bool syncInFlight;
+        bool topicBound;
+        Object* methodObject;
+
+        friend class ConnectionThread;
+        class ConnectionThread : public sys::Runnable {
+                bool operational;
+                Broker&              broker;
+                framing::Uuid        sessionId;
+                client::Connection   connection;
+                client::Session      session;
+                client::SubscriptionManager* subscriptions;
+                std::stringstream queueName;
+                sys::Mutex        connLock;
+                void run();
+            public:
+            ConnectionThread(Broker& _broker) :
+                operational(false), broker(_broker), subscriptions(0) {}
+                ~ConnectionThread();
+                void sendBuffer(qpid::framing::Buffer& buf,
+                                uint32_t               length,
+                                const std::string&     exchange = "qpid.management",
+                                const std::string&     routingKey = "broker");
+                void bindExchange(const std::string& exchange, const std::string& key);
+            };
+
+        ConnectionThread connThreadBody;
+        sys::Thread      connThread;
+
+        void encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq = 0) const;
+        bool checkHeader(framing::Buffer& buf, uint8_t *opcode, uint32_t *seq) const;
+        void received(client::Message& msg);
+        void resetAgents();
+        void updateAgent(const Object& object);
+        void waitForStable();
+        void incOutstanding();
+        void decOutstanding();
+        void setBrokerId(const framing::Uuid& id) { brokerId = id; }
+        void appendAgents(std::vector<Agent*>& agents) const;
+
+        friend std::ostream& operator<<(std::ostream& o, const Broker& k);
+    };
+
+    std::ostream& operator<<(std::ostream& o, const Broker& k);
+}
+}
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,104 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "ClassKey.h"
+#include <string.h>
+
+using namespace std;
+using namespace qpid::console;
+
+ClassKey::ClassKey(const string& _package, const string& _name, const uint8_t* _hash) :
+    package(_package), name(_name)
+{
+    ::memcpy(hash, _hash, HASH_SIZE);
+}
+
+string ClassKey::getHashString() const
+{
+    char cstr[36];
+    ::sprintf(cstr, "%02x%02x%02x%02x-%02x%02x%02x%02x-%02x%02x%02x%02x-%02x%02x%02x%02x",
+              hash[0], hash[1], hash[2], hash[3], hash[4], hash[5], hash[6], hash[7],
+              hash[8], hash[9], hash[10], hash[11], hash[12], hash[13], hash[14], hash[15]);
+    return string(cstr);
+}
+
+string ClassKey::str() const
+{
+    string result(package + ":" + name + "(" + getHashString() + ")");
+    return result;
+}
+
+bool ClassKey::operator==(const ClassKey& other) const
+{
+    return ::memcmp(hash, other.hash, HASH_SIZE) == 0 &&
+        name == other.name &&
+        package == other.package;
+}
+
+bool ClassKey::operator!=(const ClassKey& other) const
+{
+    return !(*this == other);
+}
+
+bool ClassKey::operator<(const ClassKey& other) const
+{
+    int cmp = ::memcmp(hash, other.hash, HASH_SIZE);
+    if (cmp != 0)
+        return cmp < 0;
+    cmp = name.compare(other.name);
+    if (cmp != 0)
+        return cmp < 0;
+    return package < other.package;
+}
+
+bool ClassKey::operator>(const ClassKey& other) const
+{
+    int cmp = ::memcmp(hash, other.hash, HASH_SIZE);
+    if (cmp != 0)
+        return cmp > 0;
+    cmp = name.compare(other.name);
+    if (cmp != 0)
+        return cmp > 0;
+    return package > other.package;
+}
+
+bool ClassKey::operator<=(const ClassKey& other) const
+{
+    return !(*this > other);
+}
+
+bool ClassKey::operator>=(const ClassKey& other) const
+{
+    return !(*this < other);
+}
+
+void ClassKey::encode(framing::Buffer& buffer) const
+{
+    buffer.putShortString(package);
+    buffer.putShortString(name);
+    buffer.putBin128(const_cast<uint8_t*>(hash));
+}
+
+ostream& qpid::console::operator<<(ostream& o, const ClassKey& k)
+{
+    o << k.str();
+    return o;
+}

Added: qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ClassKey.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,65 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_CLASSKEY_H_
+#define _QPID_CONSOLE_CLASSKEY_H_
+
+#include <string>
+#include "Package.h"
+#include "qpid/framing/Buffer.h"
+
+namespace qpid {
+namespace console {
+
+    /**
+     *
+     * \ingroup qmfconsoleapi
+     */
+    class ClassKey {
+    public:
+        static const int HASH_SIZE = 16;
+
+        ClassKey(const std::string& package, const std::string& name, const uint8_t* hash);
+
+        const std::string& getPackageName() const { return package; }
+        const std::string& getClassName() const { return name; }
+        const uint8_t* getHash() const { return hash; }
+        std::string getHashString() const;
+        std::string str() const;
+        bool operator==(const ClassKey& other) const;
+        bool operator!=(const ClassKey& other) const;
+        bool operator<(const ClassKey& other) const;
+        bool operator>(const ClassKey& other) const;
+        bool operator<=(const ClassKey& other) const;
+        bool operator>=(const ClassKey& other) const;
+        void encode(framing::Buffer& buffer) const;
+
+    private:
+        std::string package;
+        std::string name;
+        uint8_t hash[HASH_SIZE];
+    };
+
+    std::ostream& operator<<(std::ostream& o, const ClassKey& k);
+}
+}
+
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/ConsoleListener.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ConsoleListener.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ConsoleListener.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ConsoleListener.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,95 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_CONSOLE_LISTENER_H_
+#define _QPID_CONSOLE_CONSOLE_LISTENER_H_
+
+#include <string>
+#include "Broker.h"
+#include "ClassKey.h"
+#include "Object.h"
+
+namespace qpid {
+namespace console {
+
+    /**
+     * Implement a subclass of ConsoleListener and subscribe it using
+     * the SessionManager to receive indications.
+     *
+     * \ingroup qmfconsoleapi
+     */
+    class ConsoleListener{
+    public:
+        virtual ~ConsoleListener() {};
+
+        /** Invoked when a connection is established to a broker
+         */
+        virtual void brokerConnected(const Broker&) {}
+
+        /** Invoked when the connection to a broker is lost
+         */
+        virtual void brokerDisconnected(const Broker&) {}
+
+        /** Invoked when a QMF package is discovered.
+         */
+        virtual void newPackage(const std::string&) {}
+
+        /** Invoked when a new class is discovered.  Session.getSchema can be
+         *  used to obtain details about the class.
+         */
+        virtual void newClass(const ClassKey&) {}
+
+        /** Invoked when a QMF agent is discovered.
+         */
+        virtual void newAgent(const Agent&) {}
+
+        /** Invoked when a QMF agent disconects.
+         */
+        virtual void delAgent(const Agent&) {}
+
+        /** Invoked when an object is updated.
+         */
+        virtual void objectProps(Broker&, Object&) {}
+
+        /** Invoked when an object is updated.
+         */
+        virtual void objectStats(Broker&, Object&) {}
+
+        /** Invoked when an event is raised.
+         */
+        //virtual void event(Broker&, Event) {}
+
+        /**
+         */
+        //virtual void heartbeat(Agent&, uint64_t) {}
+
+        /**
+         */
+        virtual void brokerInfo(Broker&) {}
+
+        /**
+         */
+        //virtual void methodResponse(Broker&, uint32_t seq, MethodResponse&) {}
+    };
+}
+}
+
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/Event.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Event.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Event.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Event.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,40 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_EVENT_H_
+#define _QPID_CONSOLE_EVENT_H_
+
+#include <string>
+#include "Message.h"
+
+namespace qpid {
+namespace console {
+
+    /**
+     *
+     * \ingroup qpidconsoleapi
+     */
+    class Event {
+    };
+}
+}
+
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Object.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,324 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "SessionManager.h"
+#include "Broker.h"
+#include "Object.h"
+#include "Schema.h"
+#include "ClassKey.h"
+#include "Value.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/sys/Mutex.h"
+
+using namespace qpid::console;
+using namespace std;
+using qpid::framing::Uuid;
+using qpid::framing::FieldTable;
+using qpid::sys::Mutex;
+
+Object::Object(Broker* b, SchemaClass* s, framing::Buffer& buffer, bool prop, bool stat) :
+    broker(b), schema(s), pendingMethod(0)
+{
+    currentTime = buffer.getLongLong();
+    createTime = buffer.getLongLong();
+    deleteTime = buffer.getLongLong();
+    objectId.decode(buffer);
+
+    if (prop) {
+        set<string> excludes;
+        parsePresenceMasks(buffer, excludes);
+        for (vector<SchemaProperty*>::const_iterator pIter = schema->properties.begin();
+             pIter != schema->properties.end(); pIter++) {
+            SchemaProperty* property = *pIter;
+            if (excludes.count(property->name) != 0) {
+                attributes[property->name] = new NullValue();
+            } else {
+                attributes[property->name] = property->decodeValue(buffer);
+            }
+        }
+    }
+
+    if (stat) {
+        for (vector<SchemaStatistic*>::const_iterator sIter = schema->statistics.begin();
+             sIter != schema->statistics.end(); sIter++) {
+            SchemaStatistic* statistic = *sIter;
+            attributes[statistic->name] = statistic->decodeValue(buffer);
+        }
+    }
+}
+
+Object::~Object()
+{
+    //    for (AttributeMap::iterator iter = attributes.begin(); iter != attributes.end(); iter++)
+    //        delete iter->second;
+    //    attributes.clear();
+}
+
+const ClassKey& Object::getClassKey() const
+{
+    return schema->getClassKey();
+}
+
+std::string Object::getIndex() const
+{
+    string result;
+
+    for (vector<SchemaProperty*>::const_iterator pIter = schema->properties.begin();
+         pIter != schema->properties.end(); pIter++) {
+        SchemaProperty* property = *pIter;
+        if (property->isIndex) {
+            AttributeMap::const_iterator vIter = attributes.find(property->name);
+            if (vIter != attributes.end()) {
+                if (!result.empty())
+                    result += ":";
+                result += vIter->second->str();
+            }
+        }
+    }
+    return result;
+}
+
+void Object::mergeUpdate(const Object& /*updated*/)
+{
+    // TODO
+}
+
+void Object::invokeMethod(const string name, const AttributeMap& args, MethodResponse& result)
+{
+    for (vector<SchemaMethod*>::const_iterator iter = schema->methods.begin();
+         iter != schema->methods.end(); iter++) {
+        if ((*iter)->name == name) {
+            SchemaMethod* method = *iter;
+            char    rawbuffer[65536];
+            framing::Buffer  buffer(rawbuffer, 65536);
+            uint32_t sequence = broker->sessionManager.sequenceManager.reserve("method");
+            pendingMethod = method;
+            broker->methodObject = this;
+            broker->encodeHeader(buffer, 'M', sequence);
+            objectId.encode(buffer);
+            schema->key.encode(buffer);
+            buffer.putShortString(name);
+
+            for (vector<SchemaArgument*>::const_iterator aIter = method->arguments.begin();
+                 aIter != method->arguments.end(); aIter++) {
+                SchemaArgument* arg = *aIter;
+                if (arg->dirInput) {
+                    AttributeMap::const_iterator attr = args.find(arg->name);
+                    if (attr != args.end()) {
+                        ValueFactory::encodeValue(arg->typeCode, attr->second, buffer);
+                    } else {
+                        // TODO Use the default value instead of throwing
+                        throw Exception("Missing arguments in method call");
+                    }
+                }
+            }
+
+            uint32_t length = buffer.getPosition();
+            buffer.reset();
+            stringstream routingKey;
+            routingKey << "agent." << objectId.getBrokerBank() << "." << objectId.getAgentBank();
+            broker->connThreadBody.sendBuffer(buffer, length, "qpid.management", routingKey.str());
+
+            {
+                Mutex::ScopedLock l(broker->lock);
+                while (pendingMethod != 0)
+                    broker->cond.wait(broker->lock);
+                result = methodResponse;
+            }
+        }
+    }
+}
+
+void Object::handleMethodResp(framing::Buffer& buffer, uint32_t sequence)
+{
+    broker->sessionManager.sequenceManager.release(sequence);
+    methodResponse.code = buffer.getLong();
+    buffer.getMediumString(methodResponse.text);
+    methodResponse.arguments.clear();
+
+    for (vector<SchemaArgument*>::const_iterator aIter = pendingMethod->arguments.begin();
+         aIter != pendingMethod->arguments.end(); aIter++) {
+        SchemaArgument* arg = *aIter;
+        if (arg->dirOutput) {
+            methodResponse.arguments[arg->name] = arg->decodeValue(buffer);
+        }
+    }
+    
+    {
+        Mutex::ScopedLock l(broker->lock);
+        pendingMethod = 0;
+        broker->cond.notify();
+    }
+}
+
+ObjectId Object::attrRef(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return ObjectId();
+    Value* val = iter->second;
+    if (!val->isObjectId())
+        return ObjectId();
+    return val->asObjectId();
+}
+
+uint32_t Object::attrUint(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return 0;
+    Value* val = iter->second;
+    if (!val->isUint())
+        return 0;
+    return val->asUint();
+}
+
+int32_t Object::attrInt(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return 0;
+    Value* val = iter->second;
+    if (!val->isInt())
+        return 0;
+    return val->asInt();
+}
+
+uint64_t Object::attrUint64(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return 0;
+    Value* val = iter->second;
+    if (!val->isUint64())
+        return 0;
+    return val->asUint64();
+}
+
+int64_t Object::attrInt64(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return 0;
+    Value* val = iter->second;
+    if (!val->isInt64())
+        return 0;
+    return val->asInt64();
+}
+
+string Object::attrString(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return string();
+    Value* val = iter->second;
+    if (!val->isString())
+        return string();
+    return val->asString();
+}
+
+bool Object::attrBool(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return false;
+    Value* val = iter->second;
+    if (!val->isBool())
+        return false;
+    return val->asBool();
+}
+
+float Object::attrFloat(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return 0.0;
+    Value* val = iter->second;
+    if (!val->isFloat())
+        return 0.0;
+    return val->asFloat();
+}
+
+double Object::attrDouble(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return 0.0;
+    Value* val = iter->second;
+    if (!val->isDouble())
+        return 0.0;
+    return val->asDouble();
+}
+
+Uuid Object::attrUuid(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return Uuid();
+    Value* val = iter->second;
+    if (!val->isUuid())
+        return Uuid();
+    return val->asUuid();
+}
+
+FieldTable Object::attrMap(const std::string& key) const
+{
+    AttributeMap::const_iterator iter = attributes.find(key);
+    if (iter == attributes.end())
+        return FieldTable();
+    Value* val = iter->second;
+    if (!val->isMap())
+        return FieldTable();
+    return val->asMap();
+}
+
+void Object::parsePresenceMasks(framing::Buffer& buffer, set<string>& excludeList)
+{
+    excludeList.clear();
+    uint8_t bit = 0;
+    uint8_t mask = 0;
+
+    for (vector<SchemaProperty*>::const_iterator pIter = schema->properties.begin();
+         pIter != schema->properties.end(); pIter++) {
+        SchemaProperty* property = *pIter;
+        if (property->isOptional) {
+            if (bit == 0) {
+                mask = buffer.getOctet();
+                bit = 1;
+            }
+            if ((mask & bit) == 0)
+                excludeList.insert(property->name);
+            if (bit == 0x80)
+                bit = 0;
+            else
+                bit = bit << 1;
+        }
+    }
+}
+
+ostream& qpid::console::operator<<(ostream& o, const Object& object)
+{
+    const ClassKey& key = object.getClassKey();
+    o << key.getPackageName() << ":" << key.getClassName() << "[" << object.getObjectId() << "] " <<
+        object.getIndex();
+    return o;
+}
+

Added: qpid/trunk/qpid/cpp/src/qpid/console/Object.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Object.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Object.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Object.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,106 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_OBJECT_H_
+#define _QPID_CONSOLE_OBJECT_H_
+
+#include "ObjectId.h"
+#include "qpid/framing/Uuid.h"
+#include "qpid/framing/FieldTable.h"
+#include <map>
+#include <set>
+#include <vector>
+
+namespace qpid {
+namespace framing {
+    class Buffer;
+}
+namespace console {
+
+    class Broker;
+    class SchemaClass;
+    class SchemaMethod;
+    class ObjectId;
+    class ClassKey;
+    class Value;
+
+    /**
+     * \ingroup qmfconsoleapi
+     */
+    struct MethodResponse {
+        uint32_t code;
+        std::string text;
+        std::map<std::string, Value*> arguments;
+    };
+
+    class Object {
+    public:
+        typedef std::vector<Object> Vector;
+        typedef std::map<std::string, Value*> AttributeMap;
+
+        Object(Broker* broker, SchemaClass* schemaClass, framing::Buffer& buffer, bool prop, bool stat);
+        ~Object();
+
+        Broker* getBroker() const { return broker; }
+        const ObjectId& getObjectId() const { return objectId; }
+        const ClassKey& getClassKey() const;
+        SchemaClass* getSchema() const { return schema; }
+        uint64_t getCurrentTime() const { return currentTime; }
+        uint64_t getCreateTime() const { return createTime; }
+        uint64_t getDeleteTime() const { return deleteTime; }
+        bool isDeleted() const { return deleteTime != 0; }
+        std::string getIndex() const;
+        void mergeUpdate(const Object& updated);
+        const AttributeMap& getAttributes() const { return attributes; }
+        void invokeMethod(const std::string name, const AttributeMap& args, MethodResponse& result);
+        void handleMethodResp(framing::Buffer& buffer, uint32_t sequence);
+
+        ObjectId attrRef(const std::string& key) const;
+        uint32_t attrUint(const std::string& key) const;
+        int32_t attrInt(const std::string& key) const;
+        uint64_t attrUint64(const std::string& key) const;
+        int64_t attrInt64(const std::string& key) const;
+        std::string attrString(const std::string& key) const;
+        bool attrBool(const std::string& key) const;
+        float attrFloat(const std::string& key) const;
+        double attrDouble(const std::string& key) const;
+        framing::Uuid attrUuid(const std::string& key) const;
+        framing::FieldTable attrMap(const std::string& key) const;
+
+    private:
+        Broker* broker;
+        SchemaClass* schema;
+        ObjectId objectId;
+        uint64_t currentTime;
+        uint64_t createTime;
+        uint64_t deleteTime;
+        AttributeMap attributes;
+        SchemaMethod* pendingMethod;
+        MethodResponse methodResponse;
+
+        void parsePresenceMasks(framing::Buffer& buffer, std::set<std::string>& excludeList);
+    };
+
+    std::ostream& operator<<(std::ostream& o, const Object& object);
+}
+}
+
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,52 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "ObjectId.h"
+#include "qpid/framing/Buffer.h"
+
+using namespace qpid::console;
+using namespace std;
+
+ObjectId::ObjectId(framing::Buffer& buffer)
+{
+    decode(buffer);
+}
+
+void ObjectId::decode(framing::Buffer& buffer)
+{
+    first = buffer.getLongLong();
+    second = buffer.getLongLong();
+}
+
+void ObjectId::encode(framing::Buffer& buffer)
+{
+    buffer.putLongLong(first);
+    buffer.putLongLong(second);
+}
+
+ostream& qpid::console::operator<<(ostream& o, const ObjectId& id)
+{
+    o << (int) id.getFlags() << "-" << id.getSequence() << "-" << id.getBrokerBank() << "-" <<
+        id.getAgentBank() << "-" << id.getObject();
+    return o;
+}
+
+

Added: qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ObjectId.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,60 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_OBJECTID_H
+#define _QPID_CONSOLE_OBJECTID_H
+
+#include <iostream>
+
+namespace qpid {
+namespace framing {
+    class Buffer;
+}
+namespace console {
+
+    /**
+     *
+     * \ingroup qmfconsoleapi
+     */
+    class ObjectId {
+    public:
+        ObjectId() : first(0), second(0) {}
+        ObjectId(framing::Buffer& buffer);
+
+        uint8_t getFlags() const { return (first & 0xF000000000000000LL) >> 60; }
+        uint16_t getSequence() const { return (first & 0x0FFF000000000000LL) >> 48; }
+        uint32_t getBrokerBank() const { return (first & 0x0000FFFFF0000000LL) >> 28; }
+        uint32_t getAgentBank() const { return first & 0x000000000FFFFFFFLL; }
+        uint64_t getObject() const { return second; }
+        bool isDurable() const { return getSequence() == 0; }
+        void decode(framing::Buffer& buffer);
+        void encode(framing::Buffer& buffer);
+        void setValue(uint64_t f, uint64_t s) { first = f; second = s; }
+
+    private:
+        uint64_t first;
+        uint64_t second;
+    };
+
+    std::ostream& operator<<(std::ostream& o, const ObjectId& id);
+}
+}
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/Package.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Package.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Package.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Package.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,41 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "Package.h"
+
+using namespace qpid::console;
+
+SchemaClass* Package::getClass(const std::string& className, uint8_t* hash)
+{
+    NameHash key(className, hash);
+    ClassMap::iterator iter = classes.find(key);
+    if (iter != classes.end())
+        return iter->second;
+    return 0;
+}
+
+void Package::addClass(const std::string& className, uint8_t* hash, SchemaClass* schemaClass)
+{
+    NameHash key(className, hash);
+    ClassMap::iterator iter = classes.find(key);
+    if (iter == classes.end())
+        classes[key] = schemaClass;
+}

Added: qpid/trunk/qpid/cpp/src/qpid/console/Package.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Package.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Package.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Package.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,76 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_PACKAGE_H_
+#define _QPID_CONSOLE_PACKAGE_H_
+
+#include <string>
+#include <map>
+
+namespace qpid {
+namespace console {
+    class SchemaClass;
+
+    /**
+     *
+     * \ingroup qmfconsoleapi
+     */
+    class Package {
+    public:
+        Package(const std::string& n) : name(n) {}
+        const std::string& getName() const { return name; }
+
+    private:
+        friend class SessionManager;
+        struct NameHash {
+            std::string name;
+            uint8_t     hash[16];
+            NameHash(const std::string& n, const uint8_t* h) : name(n) {
+                for (int i = 0; i < 16; i++)
+                    hash[i] = h[i];
+            }
+        };
+
+        struct NameHashComp {
+            bool operator() (const NameHash& lhs, const NameHash& rhs) const
+            {
+                if (lhs.name != rhs.name)
+                    return lhs.name < rhs.name;
+                else
+                    for (int i = 0; i < 16; i++)
+                        if (lhs.hash[i] != rhs.hash[i])
+                            return lhs.hash[i] < rhs.hash[i];
+                return false;
+            }
+        };
+
+        typedef std::map<NameHash, SchemaClass*, NameHashComp> ClassMap;
+
+        const std::string name;
+        ClassMap classes;
+
+        SchemaClass* getClass(const std::string& className, uint8_t* hash);
+        void addClass(const std::string& className, uint8_t* hash,
+                      SchemaClass* schemaClass);
+    };
+}
+}
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Schema.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,155 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "Schema.h"
+#include "Value.h"
+#include "qpid/framing/FieldTable.h"
+
+using namespace qpid::console;
+using std::string;
+using std::vector;
+
+SchemaArgument::SchemaArgument(framing::Buffer& buffer, bool forMethod)
+{
+    framing::FieldTable map;
+    map.decode(buffer);
+
+    name = map.getAsString("name");
+    typeCode = map.getAsInt("type");
+    unit = map.getAsString("unit");
+    min = map.getAsInt("min");
+    max = map.getAsInt("max");
+    maxLen = map.getAsInt("maxlen");
+    desc = map.getAsString("desc");
+
+    dirInput = false;
+    dirOutput = false;
+    if (forMethod) {
+        string dir(map.getAsString("dir"));
+        if (dir.find('I') != dir.npos || dir.find('i') != dir.npos)
+            dirInput = true;
+        if (dir.find('O') != dir.npos || dir.find('o') != dir.npos)
+            dirOutput = true;
+    }
+}
+
+Value* SchemaArgument::decodeValue(framing::Buffer& buffer)
+{
+    return ValueFactory::newValue(typeCode, buffer);
+}
+
+SchemaProperty::SchemaProperty(framing::Buffer& buffer)
+{
+    framing::FieldTable map;
+    map.decode(buffer);
+
+    name = map.getAsString("name");
+    typeCode = map.getAsInt("type");
+    accessCode = map.getAsInt("access");
+    isIndex = map.getAsInt("index") != 0;
+    isOptional = map.getAsInt("optional") != 0;
+    unit = map.getAsString("unit");
+    min = map.getAsInt("min");
+    max = map.getAsInt("max");
+    maxLen = map.getAsInt("maxlen");
+    desc = map.getAsString("desc");
+}
+
+Value* SchemaProperty::decodeValue(framing::Buffer& buffer)
+{
+    return ValueFactory::newValue(typeCode, buffer);
+}
+
+SchemaStatistic::SchemaStatistic(framing::Buffer& buffer)
+{
+    framing::FieldTable map;
+    map.decode(buffer);
+
+    name = map.getAsString("name");
+    typeCode = map.getAsInt("type");
+    unit = map.getAsString("unit");
+    desc = map.getAsString("desc");
+}
+
+Value* SchemaStatistic::decodeValue(framing::Buffer& buffer)
+{
+    return ValueFactory::newValue(typeCode, buffer);
+}
+
+SchemaMethod::SchemaMethod(framing::Buffer& buffer)
+{
+    framing::FieldTable map;
+    map.decode(buffer);
+
+    name = map.getAsString("name");
+    desc = map.getAsString("desc");
+    int argCount = map.getAsInt("argCount");
+
+    for (int i = 0; i < argCount; i++)
+        arguments.push_back(new SchemaArgument(buffer, true));
+}
+
+SchemaMethod::~SchemaMethod()
+{
+    for (vector<SchemaArgument*>::iterator iter = arguments.begin();
+         iter != arguments.end(); iter++)
+        delete *iter;
+}
+
+SchemaClass::SchemaClass(const uint8_t _kind, const ClassKey& _key, framing::Buffer& buffer) :
+    kind(_kind), key(_key)
+{
+    if (kind == KIND_TABLE) {
+        uint16_t propCount   = buffer.getShort();
+        uint16_t statCount   = buffer.getShort();
+        uint16_t methodCount = buffer.getShort();
+
+        for (uint16_t idx = 0; idx < propCount; idx++)
+            properties.push_back(new SchemaProperty(buffer));
+        for (uint16_t idx = 0; idx < statCount; idx++)
+            statistics.push_back(new SchemaStatistic(buffer));
+        for (uint16_t idx = 0; idx < methodCount; idx++)
+            methods.push_back(new SchemaMethod(buffer));
+
+    } else if (kind == KIND_EVENT) {
+        uint16_t argCount = buffer.getShort();
+
+        for (uint16_t idx = 0; idx < argCount; idx++)
+            arguments.push_back(new SchemaArgument(buffer));
+    }
+}
+
+SchemaClass::~SchemaClass()
+{
+    for (vector<SchemaProperty*>::iterator iter = properties.begin();
+         iter != properties.end(); iter++)
+        delete *iter;
+    for (vector<SchemaStatistic*>::iterator iter = statistics.begin();
+         iter != statistics.end(); iter++)
+        delete *iter;
+    for (vector<SchemaMethod*>::iterator iter = methods.begin();
+         iter != methods.end(); iter++)
+        delete *iter;
+    for (vector<SchemaArgument*>::iterator iter = arguments.begin();
+         iter != arguments.end(); iter++)
+        delete *iter;
+}
+

Added: qpid/trunk/qpid/cpp/src/qpid/console/Schema.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/Schema.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/Schema.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/Schema.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,104 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_SCHEMA_H_
+#define _QPID_CONSOLE_SCHEMA_H_
+
+#include "ClassKey.h"
+#include <vector>
+
+namespace qpid {
+namespace framing {
+    class Buffer;
+}
+namespace console {
+    class Value;
+
+    struct SchemaArgument {
+        SchemaArgument(framing::Buffer& buffer, bool forMethod = false);
+        Value* decodeValue(framing::Buffer& buffer);
+
+        std::string name;
+        uint8_t typeCode;
+        bool dirInput;
+        bool dirOutput;
+        std::string unit;
+        int min;
+        int max;
+        int maxLen;
+        std::string desc;
+        std::string defaultVal;
+    };
+
+    struct SchemaProperty {
+        SchemaProperty(framing::Buffer& buffer);
+        Value* decodeValue(framing::Buffer& buffer);
+
+        std::string name;
+        uint8_t typeCode;
+        uint8_t accessCode;
+        bool isIndex;
+        bool isOptional;
+        std::string unit;
+        int min;
+        int max;
+        int maxLen;
+        std::string desc;
+    };
+
+    struct SchemaStatistic {
+        SchemaStatistic(framing::Buffer& buffer);
+        Value* decodeValue(framing::Buffer& buffer);
+
+        std::string name;
+        uint8_t typeCode;
+        std::string unit;
+        std::string desc;
+    };
+
+    struct SchemaMethod {
+        SchemaMethod(framing::Buffer& buffer);
+        ~SchemaMethod();
+
+        std::string name;
+        std::string desc;
+        std::vector<SchemaArgument*> arguments;
+    };
+
+    struct SchemaClass {
+        static const uint8_t KIND_TABLE = 1;
+        static const uint8_t KIND_EVENT = 2;
+
+        SchemaClass(const uint8_t kind, const ClassKey& key, framing::Buffer& buffer);
+        ~SchemaClass();
+        const ClassKey& getClassKey() const { return key; }
+
+        const uint8_t kind;
+        const ClassKey key;
+        std::vector<SchemaProperty*> properties;
+        std::vector<SchemaStatistic*> statistics;
+        std::vector<SchemaMethod*> methods;
+        std::vector<SchemaArgument*> arguments;
+    };
+}
+}
+
+
+#endif

Added: qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.cpp?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.cpp Fri Dec 19 12:22:03 2008
@@ -0,0 +1,48 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "SequenceManager.h"
+
+using namespace qpid::console;
+using namespace qpid::sys;
+using std::string;
+using std::cout;
+using std::endl;
+
+uint32_t SequenceManager::reserve(const std::string& context)
+{
+    Mutex::ScopedLock l(lock);
+    uint32_t result = sequence++;
+    pending[result] = context;
+    return result;
+}
+
+std::string SequenceManager::release(uint32_t seq)
+{
+    Mutex::ScopedLock l(lock);
+    std::map<uint32_t, string>::iterator iter = pending.find(seq);
+    if (iter == pending.end())
+        return string();
+    string result(iter->second);
+    pending.erase(iter);
+    return result;
+}
+

Added: qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h?rev=728132&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h (added)
+++ qpid/trunk/qpid/cpp/src/qpid/console/SequenceManager.h Fri Dec 19 12:22:03 2008
@@ -0,0 +1,53 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QPID_CONSOLE_SEQUENCEMANAGER_H_
+#define _QPID_CONSOLE_SEQUENCEMANAGER_H_
+
+#include "qpid/sys/Mutex.h"
+#include <map>
+#include <string>
+#include <set>
+
+namespace qpid {
+namespace console {
+
+    /**
+     *
+     * \ingroup qpidconsoleapi
+     */
+    class SequenceManager {
+    public:
+        typedef std::set<uint32_t> set;
+
+        SequenceManager() : sequence(0) {}
+        uint32_t reserve(const std::string& context = "");
+        std::string release(uint32_t seq);
+
+    private:
+        sys::Mutex lock;
+        uint32_t sequence;
+        std::map<uint32_t, std::string> pending;
+    };
+}
+}
+
+
+#endif