Remove final vestiges of old client API references from messaging and agent header files

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

11 files changed, 44 insertions, 29 deletions

diff --git a/cpp/include/qpid/agent/ManagementAgent.h b/cpp/include/qpid/agent/ManagementAgent.h
index aeb5585e61..456b657dc2 100644
--- a/cpp/include/qpid/agent/ManagementAgent.h
+++ b/cpp/include/qpid/agent/ManagementAgent.h
@@ -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.
     //
diff --git a/cpp/include/qpid/management/ManagementObject.h b/cpp/include/qpid/management/ManagementObject.h
index 9538a3e831..da255d7879 100644
--- a/cpp/include/qpid/management/ManagementObject.h
+++ b/cpp/include/qpid/management/ManagementObject.h
@@ -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; }
diff --git a/cpp/include/qpid/messaging/Address.h b/cpp/include/qpid/messaging/Address.h
index 99e41bb253..10d00ba18e 100644
--- a/cpp/include/qpid/messaging/Address.h
+++ b/cpp/include/qpid/messaging/Address.h
@@ -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 {
diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index 59fc471fe7..ae5ed4c12e 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -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 {
 
diff --git a/cpp/include/qpid/messaging/Duration.h b/cpp/include/qpid/messaging/Duration.h
index f38a1c33bc..2791e188d7 100644
--- a/cpp/include/qpid/messaging/Duration.h
+++ b/cpp/include/qpid/messaging/Duration.h
@@ -23,6 +23,7 @@
  */
 
 #include "qpid/messaging/ImportExport.h"
+
 #include "qpid/sys/IntegerTypes.h"
 
 namespace qpid {
diff --git a/cpp/include/qpid/messaging/Message.h b/cpp/include/qpid/messaging/Message.h
index c4b031046a..9ab98ae0ce 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/cpp/include/qpid/messaging/Message.h
@@ -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);
 };
diff --git a/cpp/include/qpid/messaging/Receiver.h b/cpp/include/qpid/messaging/Receiver.h
index 738ff82507..65581d06c5 100644
--- a/cpp/include/qpid/messaging/Receiver.h
+++ b/cpp/include/qpid/messaging/Receiver.h
@@ -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"
 
diff --git a/cpp/include/qpid/messaging/Sender.h b/cpp/include/qpid/messaging/Sender.h
index 80fa174d80..4b64224596 100644
--- a/cpp/include/qpid/messaging/Sender.h
+++ b/cpp/include/qpid/messaging/Sender.h
@@ -22,8 +22,10 @@
  *
  */
 #include "qpid/messaging/ImportExport.h"
+
 #include "qpid/messaging/Handle.h"
 #include "qpid/sys/IntegerTypes.h"
+
 #include <string>
 
 namespace qpid {
diff --git a/cpp/include/qpid/messaging/Session.h b/cpp/include/qpid/messaging/Session.h
index ac0ea425f6..7413417058 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/cpp/include/qpid/messaging/Session.h
@@ -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 {
diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/cpp/src/qpid/management/ManagementObject.cpp
index eb1b32bf7c..c0dd89b124 100644
--- a/cpp/src/qpid/management/ManagementObject.cpp
+++ b/cpp/src/qpid/management/ManagementObject.cpp
@@ -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& out, const ObjectId& i)
 
 }}
 
+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;
 
diff --git a/cpp/src/qpid/messaging/Message.cpp b/cpp/src/qpid/messaging/Message.cpp
index 1a04abe15b..524af023e1 100644
--- a/cpp/src/qpid/messaging/Message.cpp
+++ b/cpp/src/qpid/messaging/Message.cpp
@@ -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).");