From 120ea440ef9d048d3bb31e6118027f5c9e890fca Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 10 Jan 2011 14:06:16 +0000 Subject: Updates to the C++ implementation of QMFv2: 1) Consolidated string constants for the protocol into a definition file. 2) Added hooks for subscription handling. 3) Added checks to validate properties and arguments against the schema (if there is a schema). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057199 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qmf/Agent.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'cpp/src/qmf/Agent.cpp') diff --git a/cpp/src/qmf/Agent.cpp b/cpp/src/qmf/Agent.cpp index 05bf1a38aa..3a385b3741 100644 --- a/cpp/src/qmf/Agent.cpp +++ b/cpp/src/qmf/Agent.cpp @@ -27,6 +27,7 @@ #include "qmf/Query.h" #include "qmf/SchemaImpl.h" #include "qmf/agentCapability.h" +#include "qmf/constants.h" #include "qpid/messaging/Sender.h" #include "qpid/messaging/AddressParser.h" #include "qpid/management/Buffer.h" @@ -507,9 +508,9 @@ void AgentImpl::sendQuery(const Query& query, uint32_t correlator) Variant::Map map; Variant::Map& headers(msg.getProperties()); - headers["method"] = "request"; - headers["qmf.opcode"] = "_query_request"; - headers["x-amqp-0-10.app-id"] = "qmf2"; + headers[protocol::HEADER_KEY_METHOD] = protocol::HEADER_METHOD_REQUEST; + headers[protocol::HEADER_KEY_OPCODE] = protocol::HEADER_OPCODE_QUERY_REQUEST; + headers[protocol::HEADER_KEY_APP_ID] = protocol::HEADER_APP_ID_QMF; msg.setReplyTo(session.replyAddress); msg.setCorrelationId(boost::lexical_cast(correlator)); @@ -527,9 +528,9 @@ void AgentImpl::sendMethod(const string& method, const Variant::Map& args, const Variant::Map map; Variant::Map& headers(msg.getProperties()); - headers["method"] = "request"; - headers["qmf.opcode"] = "_method_request"; - headers["x-amqp-0-10.app-id"] = "qmf2"; + headers[protocol::HEADER_KEY_METHOD] = protocol::HEADER_METHOD_REQUEST; + headers[protocol::HEADER_KEY_OPCODE] = protocol::HEADER_OPCODE_METHOD_REQUEST; + headers[protocol::HEADER_KEY_APP_ID] = protocol::HEADER_APP_ID_QMF; map["_method_name"] = method; map["_object_id"] = addr.asMap(); -- cgit v1.2.1