Author: tedross Date: 2008-10-07 17:48:09 -0400 (Tue, 07 Oct 2008) New Revision: 2601 Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h Log: Regenerated with updated qmf-gen Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2008-10-07 17:24:28 UTC (rev 2600) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2008-10-07 21:48:09 UTC (rev 2601) @@ -112,9 +112,9 @@ const string DEFAULT("default"); } -void Journal::registerClass(ManagementAgent* agent) +void Journal::registerSelf(ManagementAgent* agent) { - agent->RegisterClass(packageName, className, md5Sum, writeSchema); + agent->registerClass(packageName, className, md5Sum, writeSchema); } void Journal::writeSchema (Buffer& buf) @@ -122,13 +122,13 @@ FieldTable ft; // Schema class header: + buf.putOctet (CLASS_KIND_TABLE); buf.putShortString (packageName); // Package Name buf.putShortString (className); // Class Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (11); // Config Element Count buf.putShort (28); // Inst Element Count buf.putShort (1); // Method Count - buf.putShort (0); // Event Count // Properties ft = FieldTable (); @@ -449,8 +449,6 @@ buf.put (ft); - // Events - } @@ -566,11 +564,12 @@ } -void Journal::doMethod (string methodName, Buffer& inBuf, Buffer& outBuf) +void Journal::doMethod (string& methodName, Buffer& inBuf, Buffer& outBuf) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; + if (methodName == "expand") { ArgsJournalExpand ioArgs; ioArgs.i_by = inBuf.getLong(); @@ -583,5 +582,3 @@ outBuf.putLong(status); outBuf.putShortString(Manageable::StatusText(status, text)); } - - Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2008-10-07 17:24:28 UTC (rev 2600) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2008-10-07 21:48:09 UTC (rev 2601) @@ -123,7 +123,7 @@ void writeProperties (::qpid::framing::Buffer& buf); void writeStatistics (::qpid::framing::Buffer& buf, bool skipHeaders = false); - void doMethod (std::string methodName, + void doMethod (std::string& methodName, ::qpid::framing::Buffer& inBuf, ::qpid::framing::Buffer& outBuf); writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } @@ -137,10 +137,10 @@ void setReference(::qpid::management::ObjectId objectId) { queueRef = objectId; } - static void registerClass (::qpid::management::ManagementAgent* agent); - std::string& getPackageName (void) { return packageName; } - std::string& getClassName (void) { return className; } - uint8_t* getMd5Sum (void) { return md5Sum; } + static void registerSelf (::qpid::management::ManagementAgent* agent); + std::string& getPackageName (void) const { return packageName; } + std::string& getClassName (void) const { return className; } + uint8_t* getMd5Sum (void) const { return md5Sum; } // Method IDs static const uint32_t METHOD_EXPAND = 1; @@ -410,8 +410,6 @@ instChanged = true; } - // Event Methods - }; }}}}} Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.cpp 2008-10-07 17:24:28 UTC (rev 2600) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.cpp 2008-10-07 21:48:09 UTC (rev 2601) @@ -30,8 +30,8 @@ Package::Package (::qpid::management::ManagementAgent* agent) { - Store::registerClass(agent); - Journal::registerClass(agent); + Store::registerSelf(agent); + Journal::registerSelf(agent); } Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2008-10-07 17:24:28 UTC (rev 2600) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2008-10-07 21:48:09 UTC (rev 2601) @@ -98,9 +98,9 @@ const string DEFAULT("default"); } -void Store::registerClass(ManagementAgent* agent) +void Store::registerSelf(ManagementAgent* agent) { - agent->RegisterClass(packageName, className, md5Sum, writeSchema); + agent->registerClass(packageName, className, md5Sum, writeSchema); } void Store::writeSchema (Buffer& buf) @@ -108,13 +108,13 @@ FieldTable ft; // Schema class header: + buf.putOctet (CLASS_KIND_TABLE); buf.putShortString (packageName); // Package Name buf.putShortString (className); // Class Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (11); // Config Element Count buf.putShort (9); // Inst Element Count buf.putShort (0); // Method Count - buf.putShort (0); // Event Count // Properties ft = FieldTable (); @@ -290,8 +290,6 @@ // Methods - // Events - } @@ -366,13 +364,12 @@ } -void Store::doMethod (string, Buffer&, Buffer& outBuf) +void Store::doMethod (string&, Buffer&, Buffer& outBuf) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; + outBuf.putLong(status); outBuf.putShortString(Manageable::StatusText(status, text)); } - - Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2008-10-07 17:24:28 UTC (rev 2600) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2008-10-07 21:48:09 UTC (rev 2601) @@ -97,7 +97,7 @@ void writeProperties (::qpid::framing::Buffer& buf); void writeStatistics (::qpid::framing::Buffer& buf, bool skipHeaders = false); - void doMethod (std::string methodName, + void doMethod (std::string& methodName, ::qpid::framing::Buffer& inBuf, ::qpid::framing::Buffer& outBuf); writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } @@ -110,10 +110,10 @@ - static void registerClass (::qpid::management::ManagementAgent* agent); - std::string& getPackageName (void) { return packageName; } - std::string& getClassName (void) { return className; } - uint8_t* getMd5Sum (void) { return md5Sum; } + static void registerSelf (::qpid::management::ManagementAgent* agent); + std::string& getPackageName (void) const { return packageName; } + std::string& getClassName (void) const { return className; } + uint8_t* getMd5Sum (void) const { return md5Sum; } // Method IDs @@ -270,8 +270,6 @@ instChanged = true; } - // Event Methods - }; }}}}}