NO-JIRA: Rename generated event PACKAGE_NAME, clashes with #defines.

PACKAGE_NAME is a common name for #define macros in legacy code.
Replaced public PACKAGE_NAME, EVENT_NAME with private camelCase members
and added static getFullName()

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

3 files changed, 27 insertions, 32 deletions

diff --git a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
index 46720e683e..a6043ffa15 100644
--- a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
@@ -35,8 +35,8 @@ using           qpid::management::Args;
 using           qpid::management::Mutex;
 using           std::string;
 
-string  Event/*MGEN:Event.NameCap*/::PACKAGE_NAME  = string ("/*MGEN:Event.NamePackageLower*/");
-string  Event/*MGEN:Event.NameCap*/::EVENT_NAME    = string ("/*MGEN:Event.Name*/");
+string  Event/*MGEN:Event.NameCap*/::packageName  = string ("/*MGEN:Event.NamePackageLower*/");
+string  Event/*MGEN:Event.NameCap*/::eventName    = string ("/*MGEN:Event.Name*/");
 uint8_t Event/*MGEN:Event.NameCap*/::md5Sum[16]   =
     {/*MGEN:Event.SchemaMD5*/};
 
@@ -54,7 +54,7 @@ namespace {
 
 void Event/*MGEN:Event.NameCap*/::registerSelf(ManagementAgent* agent)
 {
-    agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema);
+    agent->registerEvent(packageName, eventName, md5Sum, writeSchema);
 }
 
 void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema)
@@ -66,8 +66,8 @@ void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema)
 
     // Schema class header:
     buf.putOctet       (CLASS_KIND_EVENT);
-    buf.putShortString (PACKAGE_NAME); // Package Name
-    buf.putShortString (EVENT_NAME);   // Event Name
+    buf.putShortString (packageName); // Package Name
+    buf.putShortString (eventName);   // Event Name
     buf.putBin128      (md5Sum);      // Schema Hash
     buf.putShort       (/*MGEN:Event.ArgCount*/); // Argument Count
 
@@ -102,5 +102,5 @@ void Event/*MGEN:Event.NameCap*/::mapEncode(::qpid::types::Variant::Map& map) co
 
 bool Event/*MGEN:Event.NameCap*/::match(const std::string& evt, const std::string& pkg)
 {
-    return EVENT_NAME == evt && PACKAGE_NAME == pkg;
+    return eventName == evt && packageName == pkg;
 }
diff --git a/qpid/cpp/managementgen/qmfgen/templates/Event.h b/qpid/cpp/managementgen/qmfgen/templates/Event.h
index e971ffb976..98fd98d44d 100644
--- a/qpid/cpp/managementgen/qmfgen/templates/Event.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.h
@@ -34,27 +34,29 @@ QPID_BROKER_CLASS_EXTERN class Event/*MGEN:Event.NameCap*/ : public ::qpid::mana
   private:
     static void writeSchema (std::string& schema);
     static uint8_t md5Sum[MD5_LEN];
+    static std::string packageName;
+    static std::string eventName;
 
 /*MGEN:Event.ArgDeclarations*/
 
   public:
-    QPID_BROKER_EXTERN static std::string PACKAGE_NAME;
-    QPID_BROKER_EXTERN static std::string EVENT_NAME;
-
     writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; }
 
     QPID_BROKER_EXTERN Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/);
     QPID_BROKER_EXTERN ~Event/*MGEN:Event.NameCap*/() {};
 
     static void registerSelf(::qpid::management::ManagementAgent* agent);
-    std::string& getPackageName() const { return PACKAGE_NAME; }
-    std::string& getEventName() const { return EVENT_NAME; }
+    std::string& getPackageName() const { return packageName; }
+    std::string& getEventName() const { return eventName; }
     uint8_t* getMd5Sum() const { return md5Sum; }
     uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; }
     QPID_BROKER_EXTERN void encode(std::string& buffer) const;
     QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const;
 
     QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg);
+    static std::pair<std::string,std::string> getFullName() {
+        return std::make_pair(packageName, eventName);
+    }
 };
 
 }/*MGEN:Event.CloseNamespaces*/
diff --git a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
index 5769538982..11cc889ad6 100644
--- a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
@@ -76,8 +76,9 @@ const string EVENT("_event");
 const string OBJECT_NAME("_object_name");
 const string PACKAGE_NAME("_package_name");
 const string QUERY_RESPONSE("_query_response");
-const string SCHEMA_ID("_schema_id");
 const string VALUES("_values");
+const string SCHEMA_ID("_schema_id");
+const string WHAT("_what");
 
 const string ALTEX("altEx");
 const string ALTEXCHANGE("altExchange");
@@ -114,10 +115,6 @@ const string QMF_CONTENT("qmf.content");
 const string QMF_DEFAULT_TOPIC("qmf.default.topic");
 const string QMF_OPCODE("qmf.opcode");
 
-const string _WHAT("_what");
-const string _CLASS_NAME("_class_name");
-const string _PACKAGE_NAME("_package_name");
-const string _SCHEMA_ID("_schema_id");
 const string OBJECT("OBJECT");
 const string ORG_APACHE_QPID_BROKER("org.apache.qpid.broker");
 const string ORG_APACHE_QPID_HA("org.apache.qpid.ha");
@@ -132,11 +129,11 @@ void sendQuery(const string& packageName, const string& className, const string&
 {
     framing::AMQP_ServerProxy peer(sessionHandler.out);
     Variant::Map request;
-    request[_WHAT] = OBJECT;
+    request[WHAT] = OBJECT;
     Variant::Map schema;
-    schema[_CLASS_NAME] = className;
-    schema[_PACKAGE_NAME] = packageName;
-    request[_SCHEMA_ID] = schema;
+    schema[CLASS_NAME] = className;
+    schema[PACKAGE_NAME] = packageName;
+    request[SCHEMA_ID] = schema;
 
     AMQFrame method((MessageTransferBody(ProtocolVersion(), QMF_DEFAULT_DIRECT, 0, 0)));
     method.setBof(true);
@@ -271,10 +268,6 @@ class BrokerReplicator::UpdateTracker {
     ReplicationTest repTest;
 };
 
-template <class E> pair<string,string> eventKey() {
-    return make_pair(E::PACKAGE_NAME, E::EVENT_NAME);
-}
-
 BrokerReplicator::BrokerReplicator(HaBroker& hb, const boost::shared_ptr<Link>& l)
     : Exchange(QPID_CONFIGURATION_REPLICATOR),
       logPrefix("Backup: "), replicationTest(hb.getReplicationTest()),
@@ -289,14 +282,14 @@ BrokerReplicator::BrokerReplicator(HaBroker& hb, const boost::shared_ptr<Link>&
         boost::shared_ptr<broker::ConnectionObserver>(new ConnectionObserver(*this)));
     getArgs().setString(QPID_REPLICATE, printable(NONE).str());
 
-    dispatch[eventKey<EventQueueDeclare>()] = &BrokerReplicator::doEventQueueDeclare;
-    dispatch[eventKey<EventQueueDelete>()] = &BrokerReplicator::doEventQueueDelete;
-    dispatch[eventKey<EventExchangeDeclare>()] = &BrokerReplicator::doEventExchangeDeclare;
-    dispatch[eventKey<EventExchangeDelete>()] = &BrokerReplicator::doEventExchangeDelete;
-    dispatch[eventKey<EventBind>()] = &BrokerReplicator::doEventBind;
-    dispatch[eventKey<EventUnbind>()] = &BrokerReplicator::doEventUnbind;
-    dispatch[eventKey<EventMembersUpdate>()] = &BrokerReplicator::doEventMembersUpdate;
-    dispatch[eventKey<EventSubscribe>()] = &BrokerReplicator::doEventSubscribe;
+    dispatch[EventQueueDeclare::getFullName()] = &BrokerReplicator::doEventQueueDeclare;
+    dispatch[EventQueueDelete::getFullName()] = &BrokerReplicator::doEventQueueDelete;
+    dispatch[EventExchangeDeclare::getFullName()] = &BrokerReplicator::doEventExchangeDeclare;
+    dispatch[EventExchangeDelete::getFullName()] = &BrokerReplicator::doEventExchangeDelete;
+    dispatch[EventBind::getFullName()] = &BrokerReplicator::doEventBind;
+    dispatch[EventUnbind::getFullName()] = &BrokerReplicator::doEventUnbind;
+    dispatch[EventMembersUpdate::getFullName()] = &BrokerReplicator::doEventMembersUpdate;
+    dispatch[EventSubscribe::getFullName()] = &BrokerReplicator::doEventSubscribe;
 }
 
 void BrokerReplicator::initialize() {