You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2010/04/14 04:13:08 UTC
svn commit: r933842 - in /qpid/trunk/qpid/cpp: include/qpid/agent/
include/qpid/management/ include/qpid/messaging/ src/qpid/management/
src/qpid/messaging/
Author: astitcher
Date: Wed Apr 14 02:13:08 2010
New Revision: 933842
URL: http://svn.apache.org/viewvc?rev=933842&view=rev
Log:
Remove final vestiges of old client API references from messaging and agent header files
Modified:
qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h
qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Address.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Message.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/Message.cpp
Modified: qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/agent/ManagementAgent.h Wed Apr 14 02:13:08 2010
@@ -24,7 +24,6 @@
#include "qpid/management/ManagementObject.h"
#include "qpid/management/ManagementEvent.h"
#include "qpid/management/Manageable.h"
-#include "qpid/client/ConnectionSettings.h"
namespace qpid {
namespace management {
@@ -104,11 +103,6 @@ class ManagementAgent
const std::string& mech = "PLAIN",
const std::string& proto = "tcp") = 0;
- virtual void init(const client::ConnectionSettings& settings,
- uint16_t intervalSeconds = 10,
- bool useExternalThread = false,
- const std::string& storeFile = "") = 0;
-
// Register a schema with the management agent. This is normally called by the
// package initializer generated by the management code generator.
//
Modified: qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/management/ManagementObject.h Wed Apr 14 02:13:08 2010
@@ -21,11 +21,11 @@
* under the License.
*
*/
+#include "qpid/CommonImportExport.h"
-#include "qpid/sys/Time.h"
#include "qpid/management/Mutex.h"
-#include "qpid/CommonImportExport.h"
#include "qpid/types/Variant.h"
+
#include <map>
#include <vector>
@@ -158,11 +158,7 @@ protected:
//typedef void (*writeSchemaCall_t) (qpid::framing::Buffer&);
typedef void (*writeSchemaCall_t) (std::string&);
- ManagementObject(Manageable* _core) :
- createTime(uint64_t(qpid::sys::Duration(qpid::sys::now()))),
- destroyTime(0), updateTime(createTime), configChanged(true),
- instChanged(true), deleted(false),
- coreObject(_core), forcePublish(false) {}
+ QPID_COMMON_EXTERN ManagementObject(Manageable* _core);
virtual ~ManagementObject() {}
virtual writeSchemaCall_t getWriteSchemaCall() = 0;
@@ -201,12 +197,8 @@ protected:
virtual bool hasInst() { return true; }
inline void setForcePublish(bool f) { forcePublish = f; }
inline bool getForcePublish() { return forcePublish; }
- inline void setUpdateTime() { updateTime = (uint64_t(sys::Duration(sys::now()))); }
-
- inline void resourceDestroy() {
- destroyTime = uint64_t (qpid::sys::Duration(qpid::sys::now()));
- deleted = true;
- }
+ QPID_COMMON_EXTERN void setUpdateTime();
+ QPID_COMMON_EXTERN void resourceDestroy();
inline bool isDeleted() { return deleted; }
inline void setFlags(uint32_t f) { flags = f; }
inline uint32_t getFlags() { return flags; }
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Address.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Address.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Address.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Address.h Wed Apr 14 02:13:08 2010
@@ -21,10 +21,12 @@
* under the License.
*
*/
-#include <string>
+#include "qpid/messaging/ImportExport.h"
+
#include "qpid/messaging/exceptions.h"
#include "qpid/types/Variant.h"
-#include "qpid/messaging/ImportExport.h"
+
+#include <string>
#include <ostream>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Connection.h Wed Apr 14 02:13:08 2010
@@ -21,12 +21,14 @@
* under the License.
*
*/
-#include <string>
#include "qpid/messaging/ImportExport.h"
+
#include "qpid/messaging/Handle.h"
#include "qpid/messaging/exceptions.h"
#include "qpid/types/Variant.h"
+#include <string>
+
namespace qpid {
namespace messaging {
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Duration.h Wed Apr 14 02:13:08 2010
@@ -23,6 +23,7 @@
*/
#include "qpid/messaging/ImportExport.h"
+
#include "qpid/sys/IntegerTypes.h"
namespace qpid {
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Message.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Message.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Message.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Message.h Wed Apr 14 02:13:08 2010
@@ -21,12 +21,13 @@
* under the License.
*
*/
+#include "qpid/messaging/ImportExport.h"
-#include <string>
-#include "qpid/Exception.h"
#include "qpid/messaging/Duration.h"
+#include "qpid/types/Exception.h"
#include "qpid/types/Variant.h"
-#include "qpid/messaging/ImportExport.h"
+
+#include <string>
namespace qpid {
namespace messaging {
@@ -104,7 +105,7 @@ class Message
friend struct MessageImplAccess;
};
-struct EncodingException : qpid::Exception
+struct EncodingException : qpid::types::Exception
{
EncodingException(const std::string& msg);
};
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Wed Apr 14 02:13:08 2010
@@ -21,8 +21,9 @@
* under the License.
*
*/
-#include "qpid/messaging/exceptions.h"
#include "qpid/messaging/ImportExport.h"
+
+#include "qpid/messaging/exceptions.h"
#include "qpid/messaging/Handle.h"
#include "qpid/messaging/Duration.h"
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h Wed Apr 14 02:13:08 2010
@@ -22,8 +22,10 @@
*
*/
#include "qpid/messaging/ImportExport.h"
+
#include "qpid/messaging/Handle.h"
#include "qpid/sys/IntegerTypes.h"
+
#include <string>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h Wed Apr 14 02:13:08 2010
@@ -21,10 +21,12 @@
* under the License.
*
*/
+#include "qpid/messaging/ImportExport.h"
+
#include "qpid/messaging/exceptions.h"
#include "qpid/messaging/Duration.h"
-#include "qpid/messaging/ImportExport.h"
#include "qpid/messaging/Handle.h"
+
#include <string>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp Wed Apr 14 02:13:08 2010
@@ -23,6 +23,7 @@
#include "qpid/management/ManagementObject.h"
#include "qpid/framing/FieldTable.h"
#include "qpid/framing/Buffer.h"
+#include "qpid/sys/Time.h"
#include "qpid/sys/Thread.h"
#include "qpid/log/Statement.h"
#include <boost/lexical_cast.hpp>
@@ -241,6 +242,23 @@ std::ostream& operator<<(std::ostream& o
}}
+ManagementObject::ManagementObject(Manageable* _core) :
+createTime(qpid::sys::Duration(sys::EPOCH, sys::now())),
+ destroyTime(0), updateTime(createTime), configChanged(true),
+ instChanged(true), deleted(false),
+ coreObject(_core), forcePublish(false) {}
+
+void ManagementObject::setUpdateTime()
+{
+ updateTime = sys::Duration(sys::EPOCH, sys::now());
+}
+
+void ManagementObject::resourceDestroy()
+{
+ destroyTime = sys::Duration(sys::EPOCH, sys::now());
+ deleted = true;
+}
+
int ManagementObject::maxThreads = 1;
int ManagementObject::nextThreadIndex = 0;
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Message.cpp?rev=933842&r1=933841&r2=933842&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Message.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Message.cpp Wed Apr 14 02:13:08 2010
@@ -83,7 +83,7 @@ size_t Message::getContentSize() const
return impl->getBytes().size();
}
-EncodingException::EncodingException(const std::string& msg) : qpid::Exception(msg) {}
+EncodingException::EncodingException(const std::string& msg) : qpid::types::Exception(msg) {}
const std::string BAD_ENCODING("Unsupported encoding: %1% (only %2% is supported at present).");
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org