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 2010/03/30 23:35:13 UTC
svn commit: r929307 [2/5] - in /qpid/branches/qmf-devel0.7a: ./ qpid/
qpid/cpp/bindings/qmf/python/ qpid/cpp/bindings/qmf/ruby/
qpid/cpp/bindings/qmf/tests/ qpid/cpp/examples/messaging/
qpid/cpp/examples/tradedemo/ qpid/cpp/include/qmf/engine/ qpid/cpp...
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.cpp Tue Mar 30 21:35:08 2010
@@ -18,20 +18,23 @@
*/
#include "qmf/engine/ValueImpl.h"
-#include <qpid/framing/FieldTable.h>
#include <qpid/framing/FieldValue.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/framing/List.h>
using namespace std;
using namespace qmf::engine;
-using qpid::framing::Buffer;
-using qpid::framing::FieldTable;
-using qpid::framing::FieldValue;
+//using qpid::framing::Buffer;
+//using qpid::framing::FieldTable;
+//using qpid::framing::FieldValue;
+using namespace qpid::framing;
ValueImpl::ValueImpl(Typecode t, Buffer& buf) : typecode(t)
{
uint64_t first;
uint64_t second;
FieldTable ft;
+ List fl;
switch (typecode) {
case TYPE_UINT8 : value.u32 = (uint32_t) buf.getOctet(); break;
@@ -62,6 +65,10 @@ ValueImpl::ValueImpl(Typecode t, Buffer&
break;
case TYPE_LIST:
+ fl.decode(buf);
+ initList(fl);
+ break;
+
case TYPE_ARRAY:
case TYPE_OBJECT:
default:
@@ -126,7 +133,7 @@ void ValueImpl::initMap(const FieldTable
Value* subval(new Value(TYPE_DOUBLE));
subval->setDouble(fvalue.get<double>());
insert(name.c_str(), subval);
- } else {
+ } else if (amqType == 0xa8) {
FieldTable subFt;
bool valid = qpid::framing::getEncodedValue<FieldTable>(iter->second, subFt);
if (valid) {
@@ -134,6 +141,14 @@ void ValueImpl::initMap(const FieldTable
subval->impl->initMap(subFt);
insert(name.c_str(), subval);
}
+ } else if (amqType == 0xa9) {
+ List subList;
+ bool valid = qpid::framing::getEncodedValue<List>(iter->second, subList);
+ if (valid) {
+ Value* subval(new Value(TYPE_LIST));
+ subval->impl->initList(subList);
+ insert(name.c_str(), subval);
+ }
}
}
}
@@ -185,6 +200,14 @@ void ValueImpl::mapToFieldTable(FieldTab
ft.setTable(name, subFt);
break;
case TYPE_LIST:
+ {
+ List subList;
+ subval.impl->listToFramingList(subList);
+ ft.set(name,
+ ::qpid::framing::FieldTable::ValuePtr(
+ new ListValue(
+ subList)));
+ } break;
case TYPE_ARRAY:
case TYPE_OBJECT:
case TYPE_UUID:
@@ -195,9 +218,126 @@ void ValueImpl::mapToFieldTable(FieldTab
}
}
+
+void ValueImpl::initList(const List& fl)
+{
+ for (List::const_iterator iter = fl.begin();
+ iter != fl.end(); iter++) {
+ const FieldValue& fvalue(*iter->get());
+ uint8_t amqType = fvalue.getType();
+
+ if (amqType == 0x32) {
+ Value* subval(new Value(TYPE_UINT64));
+ subval->setUint64(fvalue.get<int64_t>());
+ appendToList(subval);
+ } else if ((amqType & 0xCF) == 0x02) {
+ Value* subval(new Value(TYPE_UINT32));
+ switch (amqType) {
+ case 0x02 : subval->setUint(fvalue.get<int>()); break;
+ case 0x12 : subval->setUint(fvalue.get<int>()); break;
+ case 0x22 : subval->setUint(fvalue.get<int>()); break;
+ }
+ appendToList(subval);
+ } else if ((amqType & 0xCF) == 0x01) {
+ Value* subval(new Value(TYPE_INT64));
+ subval->setInt64(fvalue.get<int64_t>());
+ appendToList(subval);
+ } else if (amqType == 0x85 || amqType == 0x95) {
+ Value* subval(new Value(TYPE_LSTR));
+ subval->setString(fvalue.get<string>().c_str());
+ appendToList(subval);
+ } else if (amqType == 0x23 || amqType == 0x33) {
+ Value* subval(new Value(TYPE_DOUBLE));
+ subval->setDouble(fvalue.get<double>());
+ appendToList(subval);
+ } else if (amqType == 0xa8) {
+ FieldTable subFt;
+ bool valid = qpid::framing::getEncodedValue<FieldTable>(*iter, subFt);
+ if (valid) {
+ Value* subval(new Value(TYPE_MAP));
+ subval->impl->initMap(subFt);
+ appendToList(subval);
+ }
+ } else if (amqType == 0xa9) {
+ List subList;
+ bool valid = qpid::framing::getEncodedValue<List>(*iter, subList);
+ if (valid) {
+ Value *subVal(new Value(TYPE_LIST));
+ subVal->impl->initList(subList);
+ appendToList(subVal);
+ }
+ }
+ }
+}
+
+void ValueImpl::listToFramingList(List& fl) const
+{
+ for (vector<Value>::const_iterator iter = vectorVal.begin();
+ iter != vectorVal.end(); iter++) {
+ const Value& subval(*iter);
+
+ switch (subval.getType()) {
+ case TYPE_UINT8:
+ case TYPE_UINT16:
+ case TYPE_UINT32:
+ fl.push_back(List::ValuePtr(new Unsigned64Value((uint64_t) subval.asUint())));
+ break;
+ case TYPE_UINT64:
+ case TYPE_DELTATIME:
+ fl.push_back(List::ValuePtr(new Unsigned64Value(subval.asUint64())));
+ break;
+ case TYPE_SSTR:
+ case TYPE_LSTR:
+ fl.push_back(List::ValuePtr(new Str16Value(subval.asString())));
+ break;
+ case TYPE_INT64:
+ case TYPE_ABSTIME:
+ fl.push_back(List::ValuePtr(new Integer64Value(subval.asInt64())));
+ break;
+ case TYPE_BOOL:
+ fl.push_back(List::ValuePtr(new IntegerValue(subval.asBool() ? 1 : 0)));
+ break;
+ case TYPE_FLOAT:
+ fl.push_back(List::ValuePtr(new FloatValue(subval.asFloat())));
+ break;
+ case TYPE_DOUBLE:
+ fl.push_back(List::ValuePtr(new DoubleValue(subval.asDouble())));
+ break;
+ case TYPE_INT8:
+ case TYPE_INT16:
+ case TYPE_INT32:
+ fl.push_back(List::ValuePtr(new IntegerValue(subval.asInt())));
+ break;
+ case TYPE_MAP:
+ {
+ FieldTable subFt;
+ subval.impl->mapToFieldTable(subFt);
+ fl.push_back(List::ValuePtr(new FieldTableValue(subFt)));
+
+ } break;
+ case TYPE_LIST:
+ {
+ List subList;
+ subval.impl->listToFramingList(subList);
+ fl.push_back(List::ValuePtr(new ListValue(subList)));
+ } break;
+
+ case TYPE_ARRAY:
+ case TYPE_OBJECT:
+ case TYPE_UUID:
+ case TYPE_REF:
+ default:
+ break;
+ }
+ }
+ }
+
+
+
void ValueImpl::encode(Buffer& buf) const
{
FieldTable ft;
+ List fl;
switch (typecode) {
case TYPE_UINT8 : buf.putOctet((uint8_t) value.u32); break;
@@ -222,6 +362,10 @@ void ValueImpl::encode(Buffer& buf) cons
ft.encode(buf);
break;
case TYPE_LIST:
+ listToFramingList(fl);
+ fl.encode(buf);
+ break;
+
case TYPE_ARRAY:
case TYPE_OBJECT:
default:
@@ -280,19 +424,6 @@ const char* ValueImpl::key(uint32_t idx)
return iter->first.c_str();
}
-Value* ValueImpl::listItem(uint32_t)
-{
- return 0;
-}
-
-void ValueImpl::appendToList(Value*)
-{
-}
-
-void ValueImpl::deleteListItem(uint32_t)
-{
-}
-
Value* ValueImpl::arrayItem(uint32_t)
{
return 0;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.h Tue Mar 30 21:35:08 2010
@@ -33,6 +33,7 @@
namespace qpid {
namespace framing {
class FieldTable;
+ class List;
}
}
@@ -138,13 +139,14 @@ namespace engine {
bool isList() const { return typecode == TYPE_LIST; }
uint32_t listItemCount() const { return vectorVal.size(); }
- Value* listItem(uint32_t idx);
- void appendToList(Value* val);
- void deleteListItem(uint32_t idx);
+ Value* listItem(uint32_t idx) { return idx < listItemCount() ? &vectorVal[idx] : 0; }
+ const Value* listItem(uint32_t idx) const { return idx < listItemCount() ? &vectorVal[idx] : 0; }
+ void appendToList(Value* val) { vectorVal.push_back(*val); }
+ void deleteListItem(uint32_t idx) { if (idx < listItemCount()) vectorVal.erase(vectorVal.begin()+idx); }
bool isArray() const { return typecode == TYPE_ARRAY; }
Typecode arrayType() const { return arrayTypecode; }
- uint32_t arrayItemCount() const { return vectorVal.size(); }
+ uint32_t arrayItemCount() const { return 0; }
Value* arrayItem(uint32_t idx);
void appendToArray(Value* val);
void deleteArrayItem(uint32_t idx);
@@ -152,6 +154,9 @@ namespace engine {
private:
void mapToFieldTable(qpid::framing::FieldTable& ft) const;
void initMap(const qpid::framing::FieldTable& ft);
+
+ void listToFramingList(qpid::framing::List& fl) const;
+ void initList(const qpid::framing::List& fl);
};
}
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/acl/Acl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/acl/Acl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/acl/Acl.cpp Tue Mar 30 21:35:08 2010
@@ -23,7 +23,7 @@
#include "qpid/Plugin.h"
#include "qpid/Options.h"
#include "qpid/log/Logger.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qmf/org/apache/qpid/acl/Package.h"
#include "qmf/org/apache/qpid/acl/EventAllow.h"
#include "qmf/org/apache/qpid/acl/EventDeny.h"
@@ -95,7 +95,7 @@ Acl::Acl (AclValues& av, Broker& b): acl
" ObjectType:" << AclHelper::getObjectTypeStr(objType) << " Name:" << name );
agent->raiseEvent(_qmf::EventAllow(id, AclHelper::getActionStr(action),
AclHelper::getObjectTypeStr(objType),
- name, messaging::Variant::Map()));
+ name, types::Variant::Map()));
case ALLOW:
return true;
case DENY:
@@ -107,7 +107,7 @@ Acl::Acl (AclValues& av, Broker& b): acl
QPID_LOG(info, "ACL Deny id:" << id << " action:" << AclHelper::getActionStr(action) << " ObjectType:" << AclHelper::getObjectTypeStr(objType) << " Name:" << name);
agent->raiseEvent(_qmf::EventDeny(id, AclHelper::getActionStr(action),
AclHelper::getObjectTypeStr(objType),
- name, messaging::Variant::Map()));
+ name, types::Variant::Map()));
return false;
}
return false;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp Tue Mar 30 21:35:08 2010
@@ -44,7 +44,7 @@ using std::ifstream;
using std::string;
using std::cout;
using std::endl;
-using qpid::messaging::Variant;
+using qpid::types::Variant;
namespace {
Mutex lock;
@@ -127,7 +127,7 @@ void ManagementAgentImpl::setName(const
attrMap["_product"] = product;
string inst;
if (instance.empty()) {
- inst = qpid::messaging::Uuid(true).str();
+ inst = qpid::types::Uuid(true).str();
} else
inst = instance;
@@ -366,8 +366,8 @@ void ManagementAgentImpl::sendHeartbeat(
messaging::Message msg;
messaging::MapContent content(msg);
- messaging::Variant::Map& map(content.asMap());
- messaging::Variant::Map headers;
+ types::Variant::Map& map(content.asMap());
+ types::Variant::Map headers;
headers["method"] = "indication";
headers["qmf.opcode"] = "_agent_heartbeat_indication";
@@ -389,9 +389,9 @@ void ManagementAgentImpl::sendException(
messaging::Message msg;
messaging::MapContent content(msg);
- messaging::Variant::Map& map(content.asMap());
- messaging::Variant::Map headers;
- messaging::Variant::Map values;
+ types::Variant::Map& map(content.asMap());
+ types::Variant::Map headers;
+ types::Variant::Map values;
headers["method"] = "indication";
headers["qmf.opcode"] = "_exception";
@@ -503,7 +503,7 @@ void ManagementAgentImpl::invokeMethodRe
failed = true;
}
- } catch(messaging::InvalidConversion& e) {
+ } catch(types::InvalidConversion& e) {
outMap.clear();
outMap["_values"] = Variant::Map();
(outMap["_values"].asMap())["_status_code"] = Manageable::STATUS_EXCEPTION;
@@ -560,7 +560,7 @@ void ManagementAgentImpl::handleGetQuery
return;
}
- if (i->second.getType() != qpid::messaging::VAR_STRING) {
+ if (i->second.getType() != qpid::types::VAR_STRING) {
sendException(replyTo, cid, "_what element is not a string");
return;
}
@@ -577,15 +577,15 @@ void ManagementAgentImpl::handleGetQuery
* Handle the _schema_id element, if supplied.
*/
i = inMap.find("_schema_id");
- if (i != inMap.end() && i->second.getType() == qpid::messaging::VAR_MAP) {
+ if (i != inMap.end() && i->second.getType() == qpid::types::VAR_MAP) {
const Variant::Map& schemaIdMap(i->second.asMap());
Variant::Map::const_iterator s_iter = schemaIdMap.find("_class_name");
- if (s_iter != schemaIdMap.end() && s_iter->second.getType() == qpid::messaging::VAR_STRING)
+ if (s_iter != schemaIdMap.end() && s_iter->second.getType() == qpid::types::VAR_STRING)
className = s_iter->second.asString();
s_iter = schemaIdMap.find("_package_name");
- if (s_iter != schemaIdMap.end() && s_iter->second.getType() == qpid::messaging::VAR_STRING)
+ if (s_iter != schemaIdMap.end() && s_iter->second.getType() == qpid::types::VAR_STRING)
packageName = s_iter->second.asString();
}
@@ -594,7 +594,7 @@ void ManagementAgentImpl::handleGetQuery
* object and return it. If it is not present, send a class-based result.
*/
i = inMap.find("_object_id");
- if (i != inMap.end() && i->second.getType() == qpid::messaging::VAR_MAP) {
+ if (i != inMap.end() && i->second.getType() == qpid::types::VAR_MAP) {
ObjectId objId(i->second.asMap());
ManagementObjectMap::iterator iter = managementObjects.find(objId);
@@ -666,8 +666,8 @@ void ManagementAgentImpl::handleLocateRe
messaging::Message msg;
messaging::MapContent content(msg);
- messaging::Variant::Map& map(content.asMap());
- messaging::Variant::Map headers;
+ types::Variant::Map& map(content.asMap());
+ types::Variant::Map headers;
headers["method"] = "indication";
headers["qmf.opcode"] = "_agent_locate_response";
@@ -770,7 +770,7 @@ Variant::Map ManagementAgentImpl::mapEnc
map_["_package_name"] = pname;
map_["_class_name"] = cname;
- map_["_hash"] = messaging::Uuid(md5Sum);
+ map_["_hash"] = types::Uuid(md5Sum);
return map_;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h Tue Mar 30 21:35:08 2010
@@ -145,7 +145,7 @@ class ManagementAgentImpl : public Manag
void received (client::Message& msg);
- qpid::messaging::Variant::Map attrMap;
+ qpid::types::Variant::Map attrMap;
std::string name_address;
uint16_t interval;
bool extThread;
@@ -208,7 +208,7 @@ class ManagementAgentImpl : public Manag
const std::string& routingKey);
void sendBuffer(const std::string& data,
const std::string& cid,
- const qpid::messaging::VariantMap headers,
+ const qpid::types::VariantMap headers,
const std::string& exchange,
const std::string& routingKey,
const std::string& contentType="amqp/map");
@@ -254,9 +254,9 @@ class ManagementAgentImpl : public Manag
PackageMap::iterator pIter,
ClassMap::iterator cIter);
void encodeHeader (framing::Buffer& buf, uint8_t opcode, uint32_t seq = 0);
- qpid::messaging::Variant::Map mapEncodeSchemaId(const std::string& pname,
- const std::string& cname,
- const uint8_t *md5Sum);
+ qpid::types::Variant::Map mapEncodeSchemaId(const std::string& pname,
+ const std::string& cname,
+ const uint8_t *md5Sum);
bool checkHeader (framing::Buffer& buf, uint8_t *opcode, uint32_t *seq);
void sendHeartbeat();
void sendException(const std::string& replyToKey, const std::string& cid,
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/System.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/System.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/System.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/System.cpp Tue Mar 30 21:35:08 2010
@@ -22,7 +22,7 @@
#include "qpid/management/ManagementAgent.h"
#include "qpid/framing/Uuid.h"
#include "qpid/sys/SystemInfo.h"
-#include "qpid/messaging/Uuid.h"
+#include "qpid/types/Uuid.h"
#include <iostream>
#include <fstream>
@@ -65,7 +65,7 @@ System::System (string _dataDir, Broker*
}
}
- mgmtObject = new _qmf::System(agent, this, messaging::Uuid(systemId.c_array()));
+ mgmtObject = new _qmf::System(agent, this, types::Uuid(systemId.c_array()));
std::string sysname, nodename, release, version, machine;
qpid::sys::SystemInfo::getSystemId (sysname,
nodename,
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp Tue Mar 30 21:35:08 2010
@@ -26,7 +26,7 @@
#include "qpid/client/amqp0_10/OutgoingMessage.h"
#include "qpid/messaging/Address.h"
#include "qpid/messaging/Message.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/Exception.h"
#include "qpid/log/Statement.h"
#include "qpid/framing/enum.h"
@@ -47,13 +47,13 @@ namespace amqp0_10 {
using qpid::Exception;
using qpid::messaging::Address;
using qpid::messaging::InvalidAddress;
-using qpid::messaging::Variant;
using qpid::framing::ExchangeBoundResult;
using qpid::framing::ExchangeQueryResult;
using qpid::framing::FieldTable;
using qpid::framing::QueueQueryResult;
using qpid::framing::ReplyTo;
using qpid::framing::Uuid;
+using namespace qpid::types;
using namespace qpid::framing::message;
using namespace boost::assign;
@@ -278,7 +278,7 @@ const Variant& getOption(const Variant::
if (j == options.end()) {
return EMPTY_VARIANT;
} else if (++index < path.size()) {
- if (j->second.getType() != qpid::messaging::VAR_MAP)
+ if (j->second.getType() != VAR_MAP)
throw InvalidAddress((boost::format("Expected %1% to be a map") % j->first).str());
return getOption(j->second.asMap(), path, index);
} else {
@@ -326,7 +326,7 @@ Opt& Opt::operator/(const std::string& n
options = 0;
} else {
value = &(j->second);
- if (value->getType() == qpid::messaging::VAR_MAP) options = &(value->asMap());
+ if (value->getType() == VAR_MAP) options = &(value->asMap());
else options = 0;
}
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h Tue Mar 30 21:35:08 2010
@@ -21,7 +21,6 @@
* under the License.
*
*/
-#include "qpid/messaging/Variant.h"
#include "qpid/client/Session.h"
namespace qpid {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/Codecs.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/Codecs.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/Codecs.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/Codecs.cpp Tue Mar 30 21:35:08 2010
@@ -19,7 +19,7 @@
*
*/
#include "qpid/client/amqp0_10/Codecs.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/framing/Array.h"
#include "qpid/framing/Buffer.h"
#include "qpid/framing/FieldTable.h"
@@ -32,6 +32,7 @@
using namespace qpid::framing;
using namespace qpid::messaging;
+using namespace qpid::types;
namespace qpid {
namespace client {
@@ -115,11 +116,11 @@ void setEncodingFor(Variant& out, uint8_
}
}
-qpid::messaging::Uuid getUuid(FieldValue& value)
+qpid::types::Uuid getUuid(FieldValue& value)
{
unsigned char data[16];
value.getFixedWidthValue<16>(data);
- return qpid::messaging::Uuid(data);
+ return qpid::types::Uuid(data);
}
Variant toVariant(boost::shared_ptr<FieldValue> in)
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/CodecsInternal.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/CodecsInternal.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/CodecsInternal.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/CodecsInternal.h Tue Mar 30 21:35:08 2010
@@ -21,7 +21,7 @@
* under the License.
*
*/
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/framing/FieldTable.h"
namespace qpid {
@@ -33,8 +33,8 @@ namespace amqp0_10 {
* Codecs.cpp but not exposed through API
*/
-void translate(const qpid::messaging::Variant::Map& from, qpid::framing::FieldTable& to);
-void translate(const qpid::framing::FieldTable& from, qpid::messaging::Variant::Map& to);
+void translate(const qpid::types::Variant::Map& from, qpid::framing::FieldTable& to);
+void translate(const qpid::framing::FieldTable& from, qpid::types::Variant::Map& to);
}}} // namespace qpid::client::amqp0_10
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp Tue Mar 30 21:35:08 2010
@@ -32,7 +32,8 @@ namespace qpid {
namespace client {
namespace amqp0_10 {
-using qpid::messaging::Variant;
+using qpid::types::Variant;
+using qpid::types::VAR_LIST;
using qpid::framing::Uuid;
void convert(const Variant::List& from, std::vector<std::string>& to)
@@ -62,7 +63,7 @@ bool setIfFound< std::vector<std::string
{
Variant::Map::const_iterator i = map.find(key);
if (i != map.end()) {
- if (i->second.getType() == qpid::messaging::VAR_LIST) {
+ if (i->second.getType() == VAR_LIST) {
convert(i->second.asList(), value);
} else {
value.push_back(i->second.asString());
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h Tue Mar 30 21:35:08 2010
@@ -22,7 +22,7 @@
*
*/
#include "qpid/messaging/ConnectionImpl.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/Url.h"
#include "qpid/client/Connection.h"
#include "qpid/client/ConnectionSettings.h"
@@ -39,14 +39,14 @@ class SessionImpl;
class ConnectionImpl : public qpid::messaging::ConnectionImpl
{
public:
- ConnectionImpl(const qpid::messaging::Variant::Map& options);
+ ConnectionImpl(const qpid::types::Variant::Map& options);
void open(const std::string& url);
void close();
qpid::messaging::Session newSession(bool transactional, const std::string& name);
qpid::messaging::Session getSession(const std::string& name) const;
void closed(SessionImpl&);
void connect();
- void setOption(const std::string& name, const qpid::messaging::Variant& value);
+ void setOption(const std::string& name, const qpid::types::Variant& value);
private:
typedef std::map<std::string, qpid::messaging::Session> Sessions;
@@ -63,7 +63,7 @@ class ConnectionImpl : public qpid::mess
int64_t maxReconnectInterval;
int32_t retries;
- void setOptions(const qpid::messaging::Variant::Map& options);
+ void setOptions(const qpid::types::Variant::Map& options);
void connect(const qpid::sys::AbsTime& started);
bool tryConnect();
bool tryConnect(const std::vector<std::string>& urls);
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp Tue Mar 30 21:35:08 2010
@@ -56,7 +56,7 @@ struct FailoverUpdatesImpl : qpid::sys::
try {
Message message;
while (!quit && receiver.fetch(message)) {
- connection.setOption("urls", message.getHeaders()["amq.failover"]);
+ connection.setOption("urls", message.getProperties()["amq.failover"]);
session.acknowledge();
}
} catch (const qpid::TransportFailure& e) {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp Tue Mar 30 21:35:08 2010
@@ -26,9 +26,10 @@
#include "qpid/client/SessionBase_0_10Access.h"
#include "qpid/log/Statement.h"
#include "qpid/messaging/Address.h"
+#include "qpid/messaging/Duration.h"
#include "qpid/messaging/Message.h"
#include "qpid/messaging/MessageImpl.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/framing/DeliveryProperties.h"
#include "qpid/framing/FrameSet.h"
#include "qpid/framing/MessageProperties.h"
@@ -44,7 +45,7 @@ using namespace qpid::framing::message;
using qpid::sys::AbsTime;
using qpid::sys::Duration;
using qpid::messaging::MessageImplAccess;
-using qpid::messaging::Variant;
+using qpid::types::Variant;
namespace {
const std::string EMPTY_STRING;
@@ -276,9 +277,10 @@ void populateHeaders(qpid::messaging::Me
const MessageProperties* messageProperties)
{
if (deliveryProperties) {
- message.setTtl(deliveryProperties->getTtl());
+ message.setTtl(qpid::messaging::Duration(deliveryProperties->getTtl()));
message.setDurable(deliveryProperties->getDeliveryMode() == DELIVERY_MODE_PERSISTENT);
- MessageImplAccess::get(message).redelivered = deliveryProperties->getRedelivered();
+ message.setPriority(deliveryProperties->getPriority());
+ message.setRedelivered(deliveryProperties->getRedelivered());
}
if (messageProperties) {
message.setContentType(messageProperties->getContentType());
@@ -286,8 +288,8 @@ void populateHeaders(qpid::messaging::Me
message.setReplyTo(AddressResolution::convert(messageProperties->getReplyTo()));
}
message.setSubject(messageProperties->getApplicationHeaders().getAsString(SUBJECT));
- message.getHeaders().clear();
- translate(messageProperties->getApplicationHeaders(), message.getHeaders());
+ message.getProperties().clear();
+ translate(messageProperties->getApplicationHeaders(), message.getProperties());
message.setCorrelationId(messageProperties->getCorrelationId());
message.setUserId(messageProperties->getUserId());
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp Tue Mar 30 21:35:08 2010
@@ -46,12 +46,15 @@ void OutgoingMessage::convert(const qpid
if (address) {
message.getMessageProperties().setReplyTo(AddressResolution::convert(address));
}
- translate(from.getHeaders(), message.getMessageProperties().getApplicationHeaders());
- message.getDeliveryProperties().setTtl(from.getTtl());
+ translate(from.getProperties(), message.getMessageProperties().getApplicationHeaders());
+ message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
if (from.getDurable()) {
message.getDeliveryProperties().setDeliveryMode(DELIVERY_MODE_PERSISTENT);
}
-
+ if (from.getRedelivered()) {
+ message.getDeliveryProperties().setRedelivered(true);
+ }
+ if (from.getPriority()) message.getDeliveryProperties().setPriority(from.getPriority());
}
namespace {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp Tue Mar 30 21:35:08 2010
@@ -30,6 +30,7 @@ namespace client {
namespace amqp0_10 {
using qpid::messaging::Receiver;
+using qpid::messaging::Duration;
void ReceiverImpl::received(qpid::messaging::Message&)
{
@@ -163,7 +164,7 @@ bool ReceiverImpl::fetchImpl(qpid::messa
} else {
sync(session).messageFlush(destination);
startFlow();//reallocate credit
- return getImpl(message, 0);
+ return getImpl(message, Duration::IMMEDIATE);
}
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h Tue Mar 30 21:35:08 2010
@@ -24,7 +24,6 @@
#include "qpid/messaging/Address.h"
#include "qpid/messaging/Message.h"
#include "qpid/messaging/ReceiverImpl.h"
-#include "qpid/messaging/Variant.h"
#include "qpid/client/AsyncSession.h"
#include "qpid/client/amqp0_10/SessionImpl.h"
#include "qpid/messaging/Duration.h"
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h Tue Mar 30 21:35:08 2010
@@ -24,7 +24,6 @@
#include "qpid/messaging/Address.h"
#include "qpid/messaging/Message.h"
#include "qpid/messaging/SenderImpl.h"
-#include "qpid/messaging/Variant.h"
#include "qpid/client/AsyncSession.h"
#include "qpid/client/amqp0_10/SessionImpl.h"
#include <memory>
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp Tue Mar 30 21:35:08 2010
@@ -43,7 +43,6 @@ using qpid::messaging::KeyError;
using qpid::messaging::MessageImplAccess;
using qpid::messaging::Sender;
using qpid::messaging::Receiver;
-using qpid::messaging::VariantMap;
namespace qpid {
namespace client {
@@ -268,8 +267,9 @@ bool SessionImpl::accept(ReceiverImpl* r
qpid::sys::Duration adjust(qpid::messaging::Duration timeout)
{
- if (timeout < (uint64_t) (qpid::sys::TIME_INFINITE/qpid::sys::TIME_MSEC)) {
- return timeout * qpid::sys::TIME_MSEC;
+ uint64_t ms = timeout.getMilliseconds();
+ if (ms < (uint64_t) (qpid::sys::TIME_INFINITE/qpid::sys::TIME_MSEC)) {
+ return ms * qpid::sys::TIME_MSEC;
} else {
return qpid::sys::TIME_INFINITE;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h Tue Mar 30 21:35:08 2010
@@ -23,7 +23,6 @@
*/
#include "qpid/messaging/SessionImpl.h"
#include "qpid/messaging/Duration.h"
-#include "qpid/messaging/Variant.h"
#include "qpid/client/Session.h"
#include "qpid/client/SubscriptionManager.h"
#include "qpid/client/amqp0_10/AddressResolution.h"
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Cluster.cpp Tue Mar 30 21:35:08 2010
@@ -668,7 +668,7 @@ void Cluster::configChange(const MemberI
QPID_LOG(debug, "Config sequence " << map.getConfigSeq());
store.setConfigSeq(map.getConfigSeq());
- // Update initital status for new members joining.
+ // Update initital status for members joining or leaving.
initMap.configChange(config);
if (initMap.isResendNeeded()) {
mcast.mcastControl(
@@ -757,6 +757,8 @@ void Cluster::initialStatus(const Member
leave(l);
return;
}
+ QPID_LOG_IF(debug, state == PRE_INIT, *this
+ << " received initial status from " << member);
initMap.received(
member,
ClusterInitialStatusBody(ProtocolVersion(), version, active, id,
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp Tue Mar 30 21:35:08 2010
@@ -38,6 +38,7 @@ ClusterTimer::ClusterTimer(Cluster& c) :
// Allow more generous overrun threshold with cluster as we
// have to do a CPG round trip before executing the task.
overran = 10*sys::TIME_MSEC;
+ late = 100*sys::TIME_MSEC;
}
ClusterTimer::~ClusterTimer() {}
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:919043-928107
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:919043-929244
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:919043-928107
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:919043-929244
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp Tue Mar 30 21:35:08 2010
@@ -29,8 +29,8 @@
#include "qpid/sys/Time.h"
#include "qpid/broker/ConnectionState.h"
#include "qpid/broker/AclModule.h"
-#include "qpid/messaging/Variant.h"
-#include "qpid/messaging/Uuid.h"
+#include "qpid/types/Variant.h"
+#include "qpid/types/Uuid.h"
#include "qpid/messaging/Message.h"
#include "qpid/messaging/ListContent.h"
#include "qpid/messaging/ListView.h"
@@ -43,7 +43,8 @@
using boost::intrusive_ptr;
using qpid::framing::Uuid;
-using qpid::messaging::Variant;
+using qpid::types::Variant;
+using qpid::types::VariantMap;
using namespace qpid::framing;
using namespace qpid::management;
using namespace qpid::broker;
@@ -54,17 +55,17 @@ namespace _qmf = qmf::org::apache::qpid:
-static qpid::messaging::Variant::Map mapEncodeSchemaId(const std::string& pname,
- const std::string& cname,
- const std::string& type,
- const uint8_t *md5Sum)
+static Variant::Map mapEncodeSchemaId(const std::string& pname,
+ const std::string& cname,
+ const std::string& type,
+ const uint8_t *md5Sum)
{
- qpid::messaging::Variant::Map map_;
+ Variant::Map map_;
map_["_package_name"] = pname;
map_["_class_name"] = cname;
map_["_type"] = type;
- map_["_hash"] = qpid::messaging::Uuid(md5Sum);
+ map_["_hash"] = qpid::types::Uuid(md5Sum);
return map_;
}
@@ -346,10 +347,10 @@ void ManagementAgent::raiseEvent(const M
if (qmf2Support) {
::qpid::messaging::Message msg;
::qpid::messaging::MapContent content(msg);
- ::qpid::messaging::VariantMap &map_ = content.asMap();
- ::qpid::messaging::VariantMap schemaId;
- ::qpid::messaging::VariantMap values;
- ::qpid::messaging::VariantMap headers;
+ VariantMap &map_ = content.asMap();
+ VariantMap schemaId;
+ VariantMap values;
+ VariantMap headers;
map_["_schema_id"] = mapEncodeSchemaId(event.getPackageName(),
event.getEventName(),
@@ -483,11 +484,11 @@ void ManagementAgent::sendBuffer(Buffer&
void ManagementAgent::sendBuffer(const std::string& data,
const std::string& cid,
- const qpid::messaging::VariantMap& headers,
+ const VariantMap& headers,
qpid::broker::Exchange::shared_ptr exchange,
const std::string& routingKey)
{
- qpid::messaging::VariantMap::const_iterator i;
+ VariantMap::const_iterator i;
if (suppressed) {
QPID_LOG(trace, "Suppressed management message to " << routingKey);
@@ -620,7 +621,7 @@ void ManagementAgent::periodicProcessing
Buffer msgBuffer(msgChars, BUFSIZE);
::qpid::messaging::Message m;
::qpid::messaging::ListContent content(m);
- ::qpid::messaging::Variant::List &list_ = content.asList();
+ Variant::List &list_ = content.asList();
for (ManagementObjectMap::iterator iter = baseIter;
iter != managementObjects.end();
@@ -650,8 +651,8 @@ void ManagementAgent::periodicProcessing
}
if ((send_stats || send_props) && qmf2Support) {
- ::qpid::messaging::Variant::Map map_;
- ::qpid::messaging::Variant::Map values;
+ Variant::Map map_;
+ Variant::Map values;
map_["_schema_id"] = mapEncodeSchemaId(object->getPackageName(),
object->getClassName(),
@@ -692,7 +693,7 @@ void ManagementAgent::periodicProcessing
const std::string &body = m.getContent();
if (body.length()) {
stringstream key;
- ::qpid::messaging::Variant::Map headers;
+ Variant::Map headers;
key << "agent.ind.data." << baseObject->getPackageName() << "." << baseObject->getClassName();
// key << "console.obj.1.0." << baseObject->getPackageName() << "." << baseObject->getClassName();
headers["method"] = "indication";
@@ -738,10 +739,10 @@ void ManagementAgent::periodicProcessing
if (qmf2Support) {
::qpid::messaging::Message m;
::qpid::messaging::ListContent content(m);
- ::qpid::messaging::Variant::List &list_ = content.asList();
- ::qpid::messaging::Variant::Map map_;
- ::qpid::messaging::Variant::Map values;
- ::qpid::messaging::Variant::Map headers;
+ Variant::List &list_ = content.asList();
+ Variant::Map map_;
+ Variant::Map values;
+ Variant::Map headers;
map_["_schema_id"] = mapEncodeSchemaId((*cdIter)->getPackageName(),
(*cdIter)->getClassName(),
@@ -793,8 +794,8 @@ void ManagementAgent::periodicProcessing
messaging::Message msg;
messaging::MapContent content(msg);
- messaging::Variant::Map& map(content.asMap());
- messaging::Variant::Map headers;
+ Variant::Map& map(content.asMap());
+ Variant::Map headers;
headers["method"] = "indication";
headers["qmf.opcode"] = "_agent_heartbeat_indication";
@@ -841,9 +842,9 @@ void ManagementAgent::deleteObjectNowLH(
if (qmf2Support) {
::qpid::messaging::Message m;
::qpid::messaging::ListContent content(m);
- ::qpid::messaging::Variant::List &list_ = content.asList();
- ::qpid::messaging::Variant::Map map_;
- ::qpid::messaging::Variant::Map values;
+ Variant::List &list_ = content.asList();
+ Variant::Map map_;
+ Variant::Map values;
map_["_schema_id"] = mapEncodeSchemaId(object->getPackageName(),
object->getClassName(),
@@ -856,7 +857,7 @@ void ManagementAgent::deleteObjectNowLH(
stringstream key;
key << "agent.ind.data." << object->getPackageName() << "." << object->getClassName();
- ::qpid::messaging::Variant::Map headers;
+ Variant::Map headers;
headers["method"] = "indication";
headers["qmf.opcode"] = "_data_indication";
headers["qmf.content"] = "_data";
@@ -1051,7 +1052,7 @@ void ManagementAgent::handleMethodReques
qpid::messaging::Message outMsg;
qpid::messaging::MapContent outMap(outMsg);
- qpid::messaging::Variant::Map headers;
+ Variant::Map headers;
headers["method"] = "response";
headers["qmf.opcode"] = "_method_response";
@@ -1070,7 +1071,7 @@ void ManagementAgent::handleMethodReques
}
ObjectId objId;
- qpid::messaging::Variant::Map inArgs;
+ Variant::Map inArgs;
try {
// coversions will throw if input is invalid.
@@ -1581,7 +1582,7 @@ void ManagementAgent::handleGetQueryLH(c
qpid::messaging::Message inMsg(body);
qpid::messaging::MapView inMap(inMsg);
qpid::messaging::MapView::const_iterator i;
- ::qpid::messaging::Variant::Map headers;
+ Variant::Map headers;
QPID_LOG(trace, "RECV GetQuery (v2): map=" << inMap << " seq=" << cid);
@@ -1593,9 +1594,9 @@ void ManagementAgent::handleGetQueryLH(c
::qpid::messaging::Message outMsg;
::qpid::messaging::ListContent content(outMsg);
- ::qpid::messaging::Variant::List &list_ = content.asList();
- ::qpid::messaging::Variant::Map map_;
- ::qpid::messaging::Variant::Map values;
+ Variant::List &list_ = content.asList();
+ Variant::Map map_;
+ Variant::Map values;
string className;
i = inMap.find("_class");
@@ -1677,8 +1678,8 @@ void ManagementAgent::handleLocateReques
messaging::Message msg;
messaging::MapContent content(msg);
- messaging::Variant::Map& map(content.asMap());
- messaging::Variant::Map headers;
+ Variant::Map& map(content.asMap());
+ Variant::Map headers;
headers["method"] = "indication";
headers["qmf.opcode"] = "_agent_locate_response";
@@ -1818,7 +1819,7 @@ bool ManagementAgent::authorizeAgentMess
qpid::messaging::Message outMsg;
qpid::messaging::MapContent outMap(outMsg);
- qpid::messaging::Variant::Map headers;
+ Variant::Map headers;
headers["method"] = "response";
headers["qmf.opcode"] = "_method_response";
@@ -2119,20 +2120,20 @@ void ManagementAgent::disallow(const std
disallowed[std::make_pair(className, methodName)] = message;
}
-void ManagementAgent::SchemaClassKey::mapEncode(qpid::messaging::Variant::Map& _map) const {
+void ManagementAgent::SchemaClassKey::mapEncode(Variant::Map& _map) const {
_map["_cname"] = name;
- _map["_hash"] = qpid::messaging::Uuid(hash);
+ _map["_hash"] = qpid::types::Uuid(hash);
}
-void ManagementAgent::SchemaClassKey::mapDecode(const qpid::messaging::Variant::Map& _map) {
- qpid::messaging::Variant::Map::const_iterator i;
+void ManagementAgent::SchemaClassKey::mapDecode(const Variant::Map& _map) {
+ Variant::Map::const_iterator i;
if ((i = _map.find("_cname")) != _map.end()) {
name = i->second.asString();
}
if ((i = _map.find("_hash")) != _map.end()) {
- const qpid::messaging::Uuid& uuid = i->second.asUuid();
+ const qpid::types::Uuid& uuid = i->second.asUuid();
memcpy(hash, uuid.data(), uuid.size());
}
}
@@ -2153,14 +2154,14 @@ uint32_t ManagementAgent::SchemaClassKey
return 1 + name.size() + 16 /* bin128 */;
}
-void ManagementAgent::SchemaClass::mapEncode(qpid::messaging::Variant::Map& _map) const {
+void ManagementAgent::SchemaClass::mapEncode(Variant::Map& _map) const {
_map["_type"] = kind;
_map["_pending_sequence"] = pendingSequence;
_map["_data"] = data;
}
-void ManagementAgent::SchemaClass::mapDecode(const qpid::messaging::Variant::Map& _map) {
- qpid::messaging::Variant::Map::const_iterator i;
+void ManagementAgent::SchemaClass::mapDecode(const Variant::Map& _map) {
+ Variant::Map::const_iterator i;
if ((i = _map.find("_type")) != _map.end()) {
kind = i->second;
@@ -2176,8 +2177,8 @@ void ManagementAgent::SchemaClass::mapDe
void ManagementAgent::exportSchemas(std::string& out) {
::qpid::messaging::Message m;
::qpid::messaging::ListContent content(m);
- ::qpid::messaging::Variant::List &list_ = content.asList();
- ::qpid::messaging::Variant::Map map_, kmap, cmap;
+ Variant::List &list_ = content.asList();
+ Variant::Map map_, kmap, cmap;
for (PackageMap::const_iterator i = packages.begin(); i != packages.end(); ++i) {
string name = i->first;
@@ -2218,7 +2219,7 @@ void ManagementAgent::importSchemas(qpid
string package;
SchemaClassKey key;
SchemaClass klass;
- ::qpid::messaging::VariantMap map_, kmap, cmap;
+ VariantMap map_, kmap, cmap;
qpid::messaging::MapView::const_iterator i;
map_ = l->asMap();
@@ -2239,8 +2240,8 @@ void ManagementAgent::importSchemas(qpid
}
}
-void ManagementAgent::RemoteAgent::mapEncode(qpid::messaging::Variant::Map& map_) const {
- ::qpid::messaging::VariantMap _objId, _values;
+void ManagementAgent::RemoteAgent::mapEncode(Variant::Map& map_) const {
+ VariantMap _objId, _values;
map_["_brokerBank"] = brokerBank;
map_["_agentBank"] = agentBank;
@@ -2253,7 +2254,7 @@ void ManagementAgent::RemoteAgent::mapEn
map_["_values"] = _values;
}
-void ManagementAgent::RemoteAgent::mapDecode(const qpid::messaging::Variant::Map& map_) {
+void ManagementAgent::RemoteAgent::mapDecode(const Variant::Map& map_) {
qpid::messaging::MapView::const_iterator i;
if ((i = map_.find("_brokerBank")) != map_.end()) {
@@ -2285,8 +2286,8 @@ void ManagementAgent::RemoteAgent::mapDe
void ManagementAgent::exportAgents(std::string& out) {
::qpid::messaging::Message m;
::qpid::messaging::ListContent content(m);
- ::qpid::messaging::Variant::List &list_ = content.asList();
- ::qpid::messaging::VariantMap map_, omap, amap;
+ Variant::List &list_ = content.asList();
+ VariantMap map_, omap, amap;
for (RemoteAgentMap::const_iterator i = remoteAgents.begin();
i != remoteAgents.end();
@@ -2315,7 +2316,7 @@ void ManagementAgent::importAgents(qpid:
for (l = content.begin(); l != content.end(); l++) {
std::auto_ptr<RemoteAgent> agent(new RemoteAgent(*this));
- ::qpid::messaging::VariantMap map_;
+ VariantMap map_;
qpid::messaging::MapView::const_iterator i;
map_ = l->asMap();
@@ -2342,9 +2343,9 @@ std::string ManagementAgent::debugSnapsh
return msg.str();
}
-qpid::messaging::Variant::Map ManagementAgent::toMap(const FieldTable& from)
+Variant::Map ManagementAgent::toMap(const FieldTable& from)
{
- qpid::messaging::Variant::Map map;
+ Variant::Map map;
for (FieldTable::const_iterator iter = from.begin(); iter != from.end(); iter++) {
const string& key(iter->first);
@@ -2356,9 +2357,9 @@ qpid::messaging::Variant::Map Management
return map;
}
-qpid::messaging::Variant::List ManagementAgent::toList(const List& from)
+Variant::List ManagementAgent::toList(const List& from)
{
- qpid::messaging::Variant::List _list;
+ Variant::List _list;
for (List::const_iterator iter = from.begin(); iter != from.end(); iter++) {
const List::ValuePtr& val(*iter);
@@ -2369,15 +2370,15 @@ qpid::messaging::Variant::List Managemen
return _list;
}
-qpid::framing::FieldTable ManagementAgent::fromMap(const qpid::messaging::Variant::Map& from)
+qpid::framing::FieldTable ManagementAgent::fromMap(const Variant::Map& from)
{
qpid::framing::FieldTable ft;
- for (qpid::messaging::Variant::Map::const_iterator iter = from.begin();
+ for (Variant::Map::const_iterator iter = from.begin();
iter != from.end();
iter++) {
const string& key(iter->first);
- const qpid::messaging::Variant& val(iter->second);
+ const Variant& val(iter->second);
ft.set(key, toFieldValue(val));
}
@@ -2386,14 +2387,14 @@ qpid::framing::FieldTable ManagementAgen
}
-List ManagementAgent::fromList(const qpid::messaging::Variant::List& from)
+List ManagementAgent::fromList(const Variant::List& from)
{
List fa;
- for (qpid::messaging::Variant::List::const_iterator iter = from.begin();
+ for (Variant::List::const_iterator iter = from.begin();
iter != from.end();
iter++) {
- const qpid::messaging::Variant& val(*iter);
+ const Variant& val(*iter);
fa.push_back(toFieldValue(val));
}
@@ -2407,22 +2408,22 @@ boost::shared_ptr<FieldValue> Management
switch(in.getType()) {
- case messaging::VAR_VOID: return boost::shared_ptr<FieldValue>(new VoidValue());
- case messaging::VAR_BOOL: return boost::shared_ptr<FieldValue>(new BoolValue(in.asBool()));
- case messaging::VAR_UINT8: return boost::shared_ptr<FieldValue>(new Unsigned8Value(in.asUint8()));
- case messaging::VAR_UINT16: return boost::shared_ptr<FieldValue>(new Unsigned16Value(in.asUint16()));
- case messaging::VAR_UINT32: return boost::shared_ptr<FieldValue>(new Unsigned32Value(in.asUint32()));
- case messaging::VAR_UINT64: return boost::shared_ptr<FieldValue>(new Unsigned64Value(in.asUint64()));
- case messaging::VAR_INT8: return boost::shared_ptr<FieldValue>(new Integer8Value(in.asInt8()));
- case messaging::VAR_INT16: return boost::shared_ptr<FieldValue>(new Integer16Value(in.asInt16()));
- case messaging::VAR_INT32: return boost::shared_ptr<FieldValue>(new Integer32Value(in.asInt32()));
- case messaging::VAR_INT64: return boost::shared_ptr<FieldValue>(new Integer64Value(in.asInt64()));
- case messaging::VAR_FLOAT: return boost::shared_ptr<FieldValue>(new FloatValue(in.asFloat()));
- case messaging::VAR_DOUBLE: return boost::shared_ptr<FieldValue>(new DoubleValue(in.asDouble()));
- case messaging::VAR_STRING: return boost::shared_ptr<FieldValue>(new Str16Value(in.asString()));
- case messaging::VAR_UUID: return boost::shared_ptr<FieldValue>(new UuidValue(in.asUuid().data()));
- case messaging::VAR_MAP: return boost::shared_ptr<FieldValue>(new FieldTableValue(ManagementAgent::fromMap(in.asMap())));
- case messaging::VAR_LIST: return boost::shared_ptr<FieldValue>(new ListValue(ManagementAgent::fromList(in.asList())));
+ case types::VAR_VOID: return boost::shared_ptr<FieldValue>(new VoidValue());
+ case types::VAR_BOOL: return boost::shared_ptr<FieldValue>(new BoolValue(in.asBool()));
+ case types::VAR_UINT8: return boost::shared_ptr<FieldValue>(new Unsigned8Value(in.asUint8()));
+ case types::VAR_UINT16: return boost::shared_ptr<FieldValue>(new Unsigned16Value(in.asUint16()));
+ case types::VAR_UINT32: return boost::shared_ptr<FieldValue>(new Unsigned32Value(in.asUint32()));
+ case types::VAR_UINT64: return boost::shared_ptr<FieldValue>(new Unsigned64Value(in.asUint64()));
+ case types::VAR_INT8: return boost::shared_ptr<FieldValue>(new Integer8Value(in.asInt8()));
+ case types::VAR_INT16: return boost::shared_ptr<FieldValue>(new Integer16Value(in.asInt16()));
+ case types::VAR_INT32: return boost::shared_ptr<FieldValue>(new Integer32Value(in.asInt32()));
+ case types::VAR_INT64: return boost::shared_ptr<FieldValue>(new Integer64Value(in.asInt64()));
+ case types::VAR_FLOAT: return boost::shared_ptr<FieldValue>(new FloatValue(in.asFloat()));
+ case types::VAR_DOUBLE: return boost::shared_ptr<FieldValue>(new DoubleValue(in.asDouble()));
+ case types::VAR_STRING: return boost::shared_ptr<FieldValue>(new Str16Value(in.asString()));
+ case types::VAR_UUID: return boost::shared_ptr<FieldValue>(new UuidValue(in.asUuid().data()));
+ case types::VAR_MAP: return boost::shared_ptr<FieldValue>(new FieldTableValue(ManagementAgent::fromMap(in.asMap())));
+ case types::VAR_LIST: return boost::shared_ptr<FieldValue>(new ListValue(ManagementAgent::fromList(in.asList())));
}
QPID_LOG(error, "Unknown Variant type - not converted: [" << in.getType() << "]");
@@ -2430,7 +2431,7 @@ boost::shared_ptr<FieldValue> Management
}
// stolen from qpid/client/amqp0_10/Codecs.cpp - TODO: make Codecs public, and remove this dup.
-qpid::messaging::Variant ManagementAgent::toVariant(const boost::shared_ptr<FieldValue>& in)
+Variant ManagementAgent::toVariant(const boost::shared_ptr<FieldValue>& in)
{
const std::string iso885915("iso-8859-15");
const std::string utf8("utf8");
@@ -2475,7 +2476,7 @@ qpid::messaging::Variant ManagementAgent
{
unsigned char data[16];
in->getFixedWidthValue<16>(data);
- out = qpid::messaging::Uuid(data);
+ out = qpid::types::Uuid(data);
} break;
//TODO: figure out whether and how to map values with codes 0x40-0xd8
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:919043-928107
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp:919043-929244
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h Tue Mar 30 21:35:08 2010
@@ -32,7 +32,7 @@
#include "qpid/management/ManagementEvent.h"
#include "qpid/management/Manageable.h"
#include "qmf/org/apache/qpid/broker/Agent.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include <qpid/framing/AMQFrame.h>
#include <qpid/framing/FieldValue.h>
#include <memory>
@@ -138,12 +138,12 @@ public:
void setBootSequence(uint16_t b) { bootSequence = b; }
// TODO: remove these when Variant API moved into common library.
- static messaging::Variant::Map toMap(const framing::FieldTable& from);
- static framing::FieldTable fromMap(const messaging::Variant::Map& from);
- static messaging::Variant::List toList(const framing::List& from);
- static framing::List fromList(const messaging::Variant::List& from);
- static boost::shared_ptr<framing::FieldValue> toFieldValue(const messaging::Variant& in);
- static messaging::Variant toVariant(const boost::shared_ptr<framing::FieldValue>& val);
+ static types::Variant::Map toMap(const framing::FieldTable& from);
+ static framing::FieldTable fromMap(const types::Variant::Map& from);
+ static types::Variant::List toList(const framing::List& from);
+ static framing::List fromList(const types::Variant::List& from);
+ static boost::shared_ptr<framing::FieldValue> toFieldValue(const types::Variant& in);
+ static types::Variant toVariant(const boost::shared_ptr<framing::FieldValue>& val);
private:
@@ -171,8 +171,8 @@ private:
ManagementObject* GetManagementObject (void) const { return mgmtObject; }
virtual ~RemoteAgent ();
- void mapEncode(qpid::messaging::Variant::Map& _map) const;
- void mapDecode(const qpid::messaging::Variant::Map& _map);
+ void mapEncode(qpid::types::Variant::Map& _map) const;
+ void mapDecode(const qpid::types::Variant::Map& _map);
};
// TODO: Eventually replace string with entire reply-to structure. reply-to
@@ -192,8 +192,8 @@ private:
std::string name;
uint8_t hash[16];
- void mapEncode(qpid::messaging::Variant::Map& _map) const;
- void mapDecode(const qpid::messaging::Variant::Map& _map);
+ void mapEncode(qpid::types::Variant::Map& _map) const;
+ void mapDecode(const qpid::types::Variant::Map& _map);
void encode(framing::Buffer& buffer) const;
void decode(framing::Buffer& buffer);
uint32_t encodedBufSize() const;
@@ -228,8 +228,8 @@ private:
bool hasSchema () { return (writeSchemaCall != 0) || !data.empty(); }
void appendSchema (framing::Buffer& buf);
- void mapEncode(qpid::messaging::Variant::Map& _map) const;
- void mapDecode(const qpid::messaging::Variant::Map& _map);
+ void mapEncode(qpid::types::Variant::Map& _map) const;
+ void mapDecode(const qpid::types::Variant::Map& _map);
};
typedef std::map<SchemaClassKey, SchemaClass, SchemaClassKeyComp> ClassMap;
@@ -283,7 +283,7 @@ private:
DisallowedMethods disallowed;
// Agent name and address
- qpid::messaging::Variant::Map attrMap;
+ qpid::types::Variant::Map attrMap;
std::string name_address;
// supported management protocol
@@ -307,7 +307,7 @@ private:
std::string routingKey);
void sendBuffer(const std::string& data,
const std::string& cid,
- const qpid::messaging::VariantMap& headers,
+ const qpid::types::VariantMap& headers,
qpid::broker::Exchange::shared_ptr exchange,
const std::string& routingKey);
void moveNewObjectsLH();
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:919043-928107
+/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h:919043-929244
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementObject.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementObject.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementObject.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementObject.cpp Tue Mar 30 21:35:08 2010
@@ -186,7 +186,7 @@ void ObjectId::setV2Key(const Management
}
// encode as V2-format map
-void ObjectId::mapEncode(messaging::VariantMap& map) const
+void ObjectId::mapEncode(types::VariantMap& map) const
{
map["_object_name"] = v2Key;
if (!agentName.empty())
@@ -196,7 +196,7 @@ void ObjectId::mapEncode(messaging::Vari
}
// decode as v2-format map
-void ObjectId::mapDecode(const messaging::VariantMap& map)
+void ObjectId::mapDecode(const types::VariantMap& map)
{
messaging::MapView::const_iterator i;
@@ -213,9 +213,9 @@ void ObjectId::mapDecode(const messaging
}
-ObjectId::operator messaging::VariantMap() const
+ObjectId::operator types::VariantMap() const
{
- messaging::VariantMap m;
+ types::VariantMap m;
mapEncode(m);
return m;
}
@@ -296,13 +296,13 @@ uint32_t ManagementObject::writeTimestam
}
-void ManagementObject::writeTimestamps (messaging::VariantMap& map) const
+void ManagementObject::writeTimestamps (types::VariantMap& map) const
{
- messaging::VariantMap oid, sid;
+ types::VariantMap oid, sid;
sid["_package_name"] = getPackageName();
sid["_class_name"] = getClassName();
- sid["_hash"] = qpid::messaging::Uuid(getMd5Sum());
+ sid["_hash"] = qpid::types::Uuid(getMd5Sum());
map["_schema_id"] = sid;
objectId.mapEncode(oid);
@@ -313,7 +313,7 @@ void ManagementObject::writeTimestamps (
map["_delete_ts"] = destroyTime;
}
-void ManagementObject::readTimestamps (const ::qpid::messaging::VariantMap& map)
+void ManagementObject::readTimestamps (const ::qpid::types::VariantMap& map)
{
messaging::MapView::const_iterator i;
@@ -340,11 +340,11 @@ int ManagementObject::getThreadIndex() {
}
-void ManagementObject::mapEncode(::qpid::messaging::VariantMap& map,
+void ManagementObject::mapEncode(::qpid::types::VariantMap& map,
bool includeProperties,
bool includeStatistics)
{
- messaging::VariantMap values;
+ types::VariantMap values;
writeTimestamps(map);
@@ -352,7 +352,7 @@ void ManagementObject::mapEncode(::qpid:
map["_values"] = values;
}
-void ManagementObject::mapDecode(const ::qpid::messaging::VariantMap& map)
+void ManagementObject::mapDecode(const ::qpid::types::VariantMap& map)
{
::qpid::messaging::MapView::const_iterator i;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Address.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Address.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Address.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Address.cpp Tue Mar 30 21:35:08 2010
@@ -26,6 +26,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
namespace {
const std::string SUBJECT_DIVIDER = "/";
const std::string OPTIONS_DIVIDER = ";";
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.cpp Tue Mar 30 21:35:08 2010
@@ -25,6 +25,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
AddressParser::AddressParser(const std::string& s) : input(s), current(0) {}
bool AddressParser::error(const std::string& message)
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.h Tue Mar 30 21:35:08 2010
@@ -31,8 +31,8 @@ class AddressParser
public:
AddressParser(const std::string&);
bool parse(Address& address);
- bool parseMap(Variant::Map& map);
- bool parseList(Variant::List& list);
+ bool parseMap(qpid::types::Variant::Map& map);
+ bool parseList(qpid::types::Variant::List& list);
private:
const std::string& input;
std::string::size_type current;
@@ -40,15 +40,15 @@ class AddressParser
bool readChar(char c);
bool readQuotedString(std::string& s);
- bool readQuotedValue(Variant& value);
+ bool readQuotedValue(qpid::types::Variant& value);
bool readString(std::string& value, char delimiter);
bool readWord(std::string& word, const std::string& delims = RESERVED);
- bool readSimpleValue(Variant& word);
+ bool readSimpleValue(qpid::types::Variant& word);
bool readKey(std::string& key);
- bool readValue(Variant& value);
- bool readKeyValuePair(Variant::Map& map);
- bool readMap(Variant& value);
- bool readList(Variant& value);
+ bool readValue(qpid::types::Variant& value);
+ bool readKeyValuePair(qpid::types::Variant::Map& map);
+ bool readMap(qpid::types::Variant& value);
+ bool readList(qpid::types::Variant& value);
bool readName(std::string& name);
bool readSubject(std::string& subject);
bool error(const std::string& message);
@@ -56,8 +56,8 @@ class AddressParser
bool iswhitespace();
bool in(const std::string& delims);
bool isreserved();
- void readListItems(Variant::List& list);
- void readMapEntries(Variant::Map& map);
+ void readListItems(qpid::types::Variant::List& list);
+ void readMapEntries(qpid::types::Variant::Map& map);
};
}} // namespace qpid::messaging
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Connection.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Connection.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Connection.cpp Tue Mar 30 21:35:08 2010
@@ -30,6 +30,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
typedef PrivateImplRef<qpid::messaging::Connection> PI;
Connection::Connection(ConnectionImpl* impl) { PI::ctor(*this, impl); }
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ConnectionImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ConnectionImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ConnectionImpl.h Tue Mar 30 21:35:08 2010
@@ -25,10 +25,14 @@
#include "qpid/RefCounted.h"
namespace qpid {
+
+namespace types {
+class Variant;
+}
+
namespace messaging {
class Session;
-class Variant;
class ConnectionImpl : public virtual qpid::RefCounted
{
@@ -38,7 +42,7 @@ class ConnectionImpl : public virtual qp
virtual void close() = 0;
virtual Session newSession(bool transactional, const std::string& name) = 0;
virtual Session getSession(const std::string& name) const = 0;
- virtual void setOption(const std::string& name, const Variant& value) = 0;
+ virtual void setOption(const std::string& name, const qpid::types::Variant& value) = 0;
private:
};
}} // namespace qpid::messaging
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListContent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListContent.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListContent.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListContent.cpp Tue Mar 30 21:35:08 2010
@@ -25,6 +25,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
class ListContentImpl : public Variant
{
Message* msg;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListView.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListView.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListView.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListView.cpp Tue Mar 30 21:35:08 2010
@@ -25,6 +25,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
class ListViewImpl : public Variant
{
public:
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapContent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapContent.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapContent.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapContent.cpp Tue Mar 30 21:35:08 2010
@@ -25,6 +25,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
class MapContentImpl : public Variant
{
Message* msg;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapView.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapView.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapView.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapView.cpp Tue Mar 30 21:35:08 2010
@@ -25,6 +25,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
class MapViewImpl : public Variant
{
public:
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Message.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Message.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Message.cpp Tue Mar 30 21:35:08 2010
@@ -24,6 +24,8 @@
namespace qpid {
namespace messaging {
+using namespace qpid::types;
+
Message::Message(const std::string& bytes) : impl(new MessageImpl(bytes)) {}
Message::Message(const char* bytes, size_t count) : impl(new MessageImpl(bytes, count)) {}
@@ -50,16 +52,20 @@ const std::string& Message::getUserId()
void Message::setCorrelationId(const std::string& id) { impl->correlationId = id; }
const std::string& Message::getCorrelationId() const { return impl->correlationId; }
-void Message::setTtl(Duration ttl) { impl->ttl = ttl; }
-Duration Message::getTtl() const { return impl->ttl; }
+uint8_t Message::getPriority() const { return impl->priority; }
+void Message::setPriority(uint8_t priority) { impl->priority = priority; }
+
+void Message::setTtl(Duration ttl) { impl->ttl = ttl.getMilliseconds(); }
+Duration Message::getTtl() const { return Duration(impl->ttl); }
void Message::setDurable(bool durable) { impl->durable = durable; }
bool Message::getDurable() const { return impl->durable; }
-bool Message::isRedelivered() const { return impl->redelivered; }
+bool Message::getRedelivered() const { return impl->redelivered; }
+void Message::setRedelivered(bool redelivered) { impl->redelivered = redelivered; }
-const VariantMap& Message::getHeaders() const { return impl->getHeaders(); }
-VariantMap& Message::getHeaders() { return impl->getHeaders(); }
+const VariantMap& Message::getProperties() const { return impl->getHeaders(); }
+VariantMap& Message::getProperties() { return impl->getHeaders(); }
void Message::setContent(const std::string& c) { impl->setBytes(c); }
void Message::setContent(const char* chars, size_t count) { impl->setBytes(chars, count); }
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.cpp Tue Mar 30 21:35:08 2010
@@ -28,13 +28,17 @@ namespace {
const std::string EMPTY_STRING = "";
}
+using namespace qpid::types;
+
MessageImpl::MessageImpl(const std::string& c) :
+ priority(0),
ttl(0),
durable(false),
redelivered(false),
bytes(c),
internalId(0) {}
MessageImpl::MessageImpl(const char* chars, size_t count) :
+ priority(0),
ttl(0),
durable (false),
redelivered(false),
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.h Tue Mar 30 21:35:08 2010
@@ -22,7 +22,7 @@
*
*/
#include "qpid/messaging/Address.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/framing/SequenceNumber.h"
namespace qpid {
@@ -36,10 +36,11 @@ struct MessageImpl
std::string messageId;
std::string userId;
std::string correlationId;
+ uint8_t priority;
uint64_t ttl;
bool durable;
bool redelivered;
- Variant::Map headers;
+ qpid::types::Variant::Map headers;
std::string bytes;
@@ -57,8 +58,8 @@ struct MessageImpl
void setContentType(const std::string& s);
const std::string& getContentType() const;
- const Variant::Map& getHeaders() const;
- Variant::Map& getHeaders();
+ const qpid::types::Variant::Map& getHeaders() const;
+ qpid::types::Variant::Map& getHeaders();
void setBytes(const std::string& bytes);
void setBytes(const char* chars, size_t count);
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Address.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Address.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Address.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Address.cpp Tue Mar 30 21:35:08 2010
@@ -20,11 +20,12 @@
*/
#include <iostream>
#include "qpid/messaging/Address.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "unit_test.h"
using namespace qpid::messaging;
+using namespace qpid::types;
namespace qpid {
namespace tests {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ClientMessage.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ClientMessage.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ClientMessage.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ClientMessage.cpp Tue Mar 30 21:35:08 2010
@@ -34,11 +34,11 @@ QPID_AUTO_TEST_CASE(testCopyConstructor)
{
Message m("my-data");
m.setSubject("my-subject");
- m.getHeaders()["a"] = "ABC";
+ m.getProperties()["a"] = "ABC";
Message c(m);
BOOST_CHECK_EQUAL(m.getContent(), c.getContent());
BOOST_CHECK_EQUAL(m.getSubject(), c.getSubject());
- BOOST_CHECK_EQUAL(m.getHeaders()["a"], c.getHeaders()["a"]);
+ BOOST_CHECK_EQUAL(m.getProperties()["a"], c.getProperties()["a"]);
}
QPID_AUTO_TEST_SUITE_END()
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ManagementTest.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ManagementTest.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ManagementTest.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ManagementTest.cpp Tue Mar 30 21:35:08 2010
@@ -56,7 +56,7 @@ QPID_AUTO_TEST_CASE(testObjectIdSerializ
}
QPID_AUTO_TEST_CASE(testObjectIdEncode) {
- qpid::messaging::Variant::Map oidMap;
+ qpid::types::Variant::Map oidMap;
ObjectId oid(1, 2, 3, 9999);
oid.setV2Key("testkey");
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org