Author: tedross Date: 2012-11-30 14:18:38 -0500 (Fri, 30 Nov 2012) New Revision: 4521 Modified: store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/lib/Makefile.am store/trunk/cpp/lib/MessageStoreImpl.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h store/trunk/cpp/tests/Makefile.am Log: Regenerated management files, updated to match reverted API in the broker (QPID-4449). Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/lib/JournalImpl.h 2012-11-30 19:18:38 UTC (rev 4521) @@ -207,7 +207,7 @@ virtual void wr_aio_cb(std::vector<mrg::journal::data_tok*>& dtokl); virtual void rd_aio_cb(std::vector<u_int16_t>& pil); - qpid::management::ManagementObject::shared_ptr GetManagementObjectShared (void) const + qpid::management::ManagementObject::shared_ptr GetManagementObject (void) const { return _mgmtObject; } qpid::management::Manageable::status_t ManagementMethod (uint32_t, Modified: store/trunk/cpp/lib/Makefile.am =================================================================== --- store/trunk/cpp/lib/Makefile.am 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/lib/Makefile.am 2012-11-30 19:18:38 UTC (rev 4521) @@ -19,7 +19,7 @@ # # The GNU Lesser General Public License is available in the file COPYING. -AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) -I$(srcdir)/gen -DRHM_CLEAN -pthread +AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) -I$(srcdir)/gen -DRHM_CLEAN -pthread -D_IN_QPID_BROKER #SUBDIRS = jrnl2 Modified: store/trunk/cpp/lib/MessageStoreImpl.h =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.h 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/lib/MessageStoreImpl.h 2012-11-30 19:18:38 UTC (rev 4521) @@ -363,7 +363,7 @@ void abort(qpid::broker::TransactionContext& ctxt); - qpid::management::ManagementObject::shared_ptr GetManagementObjectShared (void) const + qpid::management::ManagementObject::shared_ptr GetManagementObject (void) const { return mgmtObject; } inline qpid::management::Manageable::status_t ManagementMethod (u_int32_t, qpid::management::Args&) 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 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2012-11-30 19:18:38 UTC (rev 4521) @@ -27,6 +27,7 @@ #include "qpid/management/ManagementObject.h" #include "qmf/BrokerImportExport.h" +#include <boost/shared_ptr.hpp> #include <limits> @@ -134,8 +135,10 @@ void aggregatePerThreadStats(struct PerThreadStats*) const; public: + typedef boost::shared_ptr<Journal> shared_ptr; + QPID_BROKER_EXTERN static void writeSchema(std::string& schema); QPID_BROKER_EXTERN void mapEncodeValues(::qpid::types::Variant::Map& map, bool includeProperties=true, 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 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2012-11-30 19:18:38 UTC (rev 4521) @@ -49,7 +49,7 @@ Store::Store (ManagementAgent*, Manageable* _core, ::qpid::management::Manageable* _parent) : ManagementObject(_core) { - brokerRef = _parent->GetManagementObjectShared()->getObjectId (); + brokerRef = _parent->GetManagementObject()->getObjectId(); location = ""; defaultInitialFileCount = 0; defaultDataFileSize = 0; 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 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2012-11-30 19:18:38 UTC (rev 4521) @@ -27,6 +27,7 @@ #include "qpid/management/ManagementObject.h" #include "qmf/BrokerImportExport.h" +#include <boost/shared_ptr.hpp> #include <limits> @@ -104,8 +105,10 @@ void aggregatePerThreadStats(struct PerThreadStats*) const; public: + typedef boost::shared_ptr<Store> shared_ptr; + QPID_BROKER_EXTERN static void writeSchema(std::string& schema); QPID_BROKER_EXTERN void mapEncodeValues(::qpid::types::Variant::Map& map, bool includeProperties=true, Modified: store/trunk/cpp/tests/Makefile.am =================================================================== --- store/trunk/cpp/tests/Makefile.am 2012-11-21 14:50:13 UTC (rev 4520) +++ store/trunk/cpp/tests/Makefile.am 2012-11-30 19:18:38 UTC (rev 4521) @@ -22,7 +22,7 @@ abs_builddir=@abs_builddir@ abs_srcdir=@abs_srcdir@ -AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) -DBOOST_TEST_DYN_LINK +AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) $(QPID_CXXFLAGS) -DBOOST_TEST_DYN_LINK -D_IN_QPID_BROKER INCLUDES=-I$(top_srcdir)/lib -I$(abs_builddir)/../lib -I$(top_srcdir)/lib/gen @@ -117,4 +117,4 @@ check-short: all $(MAKE) check TESTS="$(SHORT_TESTS)" SUBDIRS=. - +