qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1151956 [2/3] - in /qpid/branches/qpid-3163/qpid/cpp: ./ examples/messaging/ include/qmf/ include/qmf/engine/ include/qpid/ include/qpid/agent/ include/qpid/client/ include/qpid/console/ include/qpid/framing/ include/qpid/log/ include/qpid...
Date Thu, 28 Jul 2011 18:29:32 GMT
Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Connection.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Connection.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Connection.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Connection.h Thu Jul 28 18:28:56 2011
@@ -40,8 +40,8 @@ class ConnectionInputHandlerFactory;
 
 namespace amqp_0_10 {
 
-class Connection  : public sys::ConnectionCodec,
-                    public sys::ConnectionOutputHandler
+class QPID_BROKER_CLASS_EXTERN Connection  : public sys::ConnectionCodec,
+                                             public sys::ConnectionOutputHandler
 {
     typedef std::deque<framing::AMQFrame> FrameQueue;
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Exception.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Exception.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Exception.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Exception.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,11 +28,11 @@
 namespace qpid {
 namespace amqp_0_10 {
 
-/** 
+/**
  * Raised when the connection is unexpectedly closed. Sessions with
  * non-0 timeout may be available for re-attachment on another connection.
  */
-struct ConnectionException : public qpid::Exception {
+struct QPID_COMMON_CLASS_EXTERN ConnectionException : public qpid::Exception {
     // FIXME aconway 2008-04-04: Merge qpid::ConnectionException
     // into this when the old code is removed.
     typedef connection::CloseCode Code;
@@ -45,21 +45,21 @@ struct ConnectionException : public qpid
  * Raised when a session is unexpectedly detached for any reason, or
  * if an attempt is made to use a session that is not attached.
  */
-struct SessionException : public qpid::Exception  {
+struct QPID_COMMON_CLASS_EXTERN SessionException : public qpid::Exception  {
     // FIXME aconway 2008-04-04: should not have a code at this level.
     // Leave in place till old preview code is gone.
-    SessionException(int /*code*/, const std::string& msg) : qpid::Exception(msg) {} 
+    SessionException(int /*code*/, const std::string& msg) : qpid::Exception(msg) {}
 };
 
 /** Raised when the state of a session has been destroyed */
-struct SessionDestroyedException : public SessionException {
+struct QPID_COMMON_CLASS_EXTERN SessionDestroyedException : public SessionException {
     // FIXME aconway 2008-04-04: should not have a code at this level.
     // Leave in place till old preview code is gone.
-    SessionDestroyedException(int code, const std::string& msg) : SessionException(code, msg){} 
+    SessionDestroyedException(int code, const std::string& msg) : SessionException(code, msg){}
 };
 
 /** Raised when a session is destroyed due to an execution.exception */
-struct SessionAbortedException : public SessionDestroyedException {
+struct QPID_COMMON_CLASS_EXTERN SessionAbortedException : public SessionDestroyedException {
     typedef execution::ErrorCode Code;
     SessionAbortedException(Code c, const std::string m)
         : SessionDestroyedException(c, m), code(c) {}
@@ -70,7 +70,7 @@ struct SessionAbortedException : public 
  * Raised when a session with 0 timeout is unexpectedly detached
  * and therefore expires and is destroyed.
  */
-struct SessionExpiredException : public SessionDestroyedException {
+struct QPID_COMMON_CLASS_EXTERN SessionExpiredException : public SessionDestroyedException {
     typedef session::DetachCode Code;
     SessionExpiredException(Code c, const std::string m)
         : SessionDestroyedException(c, m), code(c) {}
@@ -80,17 +80,17 @@ struct SessionExpiredException : public 
 /**
  * Raised when a session with non-0 timeout is unexpectedly detached
  * or if an attempt is made to use a session that is not attached.
- * 
+ *
  * The session is not necessarily destroyed, it may be possible to
  * re-attach.
  */
-struct SessionDetachedException : public SessionException {
+struct QPID_COMMON_CLASS_EXTERN SessionDetachedException : public SessionException {
     typedef session::DetachCode Code;
     SessionDetachedException(Code c, const std::string m)
         : SessionException(c, m), code(c) {}
     Code code;
 };
-    
+
 }} // namespace qpid::amqp_0_10
 
 #endif  /*!QPID_AMQP_0_10_EXCEPTION_H*/

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Map.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Map.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Map.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/amqp_0_10/Map.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on ang
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,9 +38,9 @@ namespace amqp_0_10 {
 
 class Map;
 
-class MapValue {
+class QPID_COMMON_CLASS_EXTERN MapValue {
   public:
-    struct BadTypeException : public Exception {};
+    struct QPID_COMMON_CLASS_EXTERN BadTypeException : public Exception {};
 
     template <class R> struct Visitor { typedef R result_type; };
 
@@ -56,7 +56,7 @@ class MapValue {
     template <class V> typename V::result_type apply_visitor(const V&);
 
     uint8_t getCode() const { return code; }
-    
+
     bool operator==(const MapValue&) const;
 
     template <class S> void serialize(S& s) { s(code); s.split(*this); }
@@ -67,7 +67,7 @@ class MapValue {
         DecodeVisitor<S> dv(blob, s);
         qpid::amqp_0_10::apply_visitor(dv, code);
     }
-    
+
 
   private:
     // TODO aconway 2008-04-15: Estimate required size, we will get a
@@ -85,7 +85,7 @@ class MapValue {
     Blob blob;
 };
 
-class Map : public std::map<Str8, MapValue> {
+class QPID_COMMON_CLASS_EXTERN Map : public std::map<Str8, MapValue> {
   public:
     template <class S> void serialize(S& s) { s.split(*this); }
     template <class S> void encode(S& s) const;
@@ -93,7 +93,7 @@ class Map : public std::map<Str8, MapVal
     void encode(Codec::Size& s) const  { s.raw(0, contentSize() + 4/*size*/); }
 
     template <class S> void decode(S& s);
-    
+
   private:
     uint32_t contentSize() const;
 };
@@ -122,7 +122,7 @@ template <class V> struct MapValue::Visi
         return visitor(*reinterpret_cast<T*>(blob.get()));
     }
 };
-    
+
 template <class V> typename V::result_type MapValue::apply_visitor(V& v) {
     VisitVisitor<V> visitor(v, blob);
     return qpid::amqp_0_10::apply_visitor(visitor, code);
@@ -137,13 +137,13 @@ template <class R> struct MapValue::GetV
     R* operator()(R& r) { return &r; }
     template <class T> R* operator()(T&) { return 0; }
 };
-    
+
 template <class D> struct MapValue::DecodeVisitor {
     typedef void result_type;
     MapValue::Blob& blob;
     D& decoder;
     DecodeVisitor(Blob& b, D& d) : blob(b), decoder(d) {}
-    
+
     template <class T> void operator()(T*) {
         T t;
         decoder(t);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/assert.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/assert.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/assert.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/assert.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,15 +23,15 @@
  */
 
 #include <boost/current_function.hpp>
-
+#include "qpid/CommonImportExport.h"
 /**
- * Abort if !expr in debug mode, throw an exception if NDEBUG is set. 
+ * Abort if !expr in debug mode, throw an exception if NDEBUG is set.
  */
 #define QPID_ASSERT(expr) ((expr) ? static_cast<void>(0) : ::qpid::assert_fail(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__))
 
 namespace qpid {
 
-void assert_fail(char const * expr, char const * function, char const * file, long line); 
+QPID_COMMON_EXTERN void assert_fail(char const * expr, char const * function, char const * file, long line);
 
 } // namespace qpid
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Bridge.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Bridge.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Bridge.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Bridge.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,6 +31,7 @@
 #include "qpid/broker/Exchange.h"
 #include "qmf/org/apache/qpid/broker/ArgsLinkBridge.h"
 #include "qmf/org/apache/qpid/broker/Bridge.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 #include <boost/function.hpp>
 #include <memory>
@@ -43,7 +44,9 @@ class ConnectionState;
 class Link;
 class LinkRegistry;
 
-class Bridge : public PersistableConfig, public management::Manageable, public Exchange::DynamicBridge
+class QPID_BROKER_CLASS_EXTERN Bridge :
+        public PersistableConfig, public management::Manageable,
+        public Exchange::DynamicBridge
 {
 public:
     typedef boost::shared_ptr<Bridge> shared_ptr;
@@ -68,7 +71,7 @@ public:
     void     setPersistenceId(uint64_t id) const;
     uint64_t getPersistenceId() const { return persistenceId; }
     uint32_t encodedSize() const;
-    void     encode(framing::Buffer& buffer) const; 
+    void     encode(framing::Buffer& buffer) const;
     const std::string& getName() const;
     static Bridge::shared_ptr decode(LinkRegistry& links, framing::Buffer& buffer);
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.cpp Thu Jul 28 18:28:56 2011
@@ -20,6 +20,7 @@
  */
 
 #include "qpid/broker/Broker.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/broker/ConnectionState.h"
 #include "qpid/broker/DirectExchange.h"
 #include "qpid/broker/FanOutExchange.h"
@@ -508,7 +509,7 @@ const std::string _TRUE("true");
 const std::string _FALSE("false");
 }
 
-struct InvalidBindingIdentifier : public qpid::Exception
+struct QPID_BROKER_CLASS_EXTERN InvalidBindingIdentifier : public qpid::Exception
 {
     InvalidBindingIdentifier(const std::string& name) : qpid::Exception(name) {}
     std::string getPrefix() const { return "invalid binding"; }
@@ -543,13 +544,13 @@ struct BindingIdentifier
     }
 };
 
-struct ObjectAlreadyExists : public qpid::Exception
+struct QPID_BROKER_CLASS_EXTERN ObjectAlreadyExists : public qpid::Exception
 {
     ObjectAlreadyExists(const std::string& name) : qpid::Exception(name) {}
     std::string getPrefix() const { return "object already exists"; }
 };
 
-struct UnknownObjectType : public qpid::Exception
+struct QPID_BROKER_CLASS_EXTERN UnknownObjectType : public qpid::Exception
 {
     UnknownObjectType(const std::string& type) : qpid::Exception(type) {}
     std::string getPrefix() const { return "unknown object type"; }

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Broker.h Thu Jul 28 18:28:56 2011
@@ -84,9 +84,10 @@ struct NoSuchTransportException : qpid::
 /**
  * A broker instance.
  */
-class Broker : public sys::Runnable, public Plugin::Target,
-               public management::Manageable,
-               public RefCounted
+class QPID_BROKER_CLASS_EXTERN Broker :
+        public sys::Runnable, public Plugin::Target,
+        public management::Manageable,
+        public RefCounted
 {
 public:
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/BrokerImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/BrokerImportExport.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/BrokerImportExport.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/BrokerImportExport.h Thu Jul 28 18:28:56 2011
@@ -20,23 +20,16 @@
  * under the License.
  */
 
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#  if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
-#    define QPID_BROKER_EXTERN __declspec(dllexport)
-#  else
-#    define QPID_BROKER_EXTERN __declspec(dllimport)
-#  endif
-#  ifdef _MSC_VER
-#    define QPID_BROKER_CLASS_EXTERN
-#    define QPID_BROKER_INLINE_EXTERN QPID_BROKER_EXTERN
-#  else
-#    define QPID_BROKER_CLASS_EXTERN QPID_BROKER_EXTERN
-#    define QPID_BROKER_INLINE_EXTERN
-#  endif
+#include "qpid/ImportExport.h"
+
+#if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
+#  define QPID_BROKER_EXTERN QPID_EXPORT
+#  define QPID_BROKER_CLASS_EXTERN QPID_CLASS_EXPORT
+#  define QPID_BROKER_INLINE_EXTERN QPID_INLINE_EXPORT
 #else
-#  define QPID_BROKER_EXTERN
-#  define QPID_BROKER_CLASS_EXTERN
-#  define QPID_BROKER_INLINE_EXTERN
+#  define QPID_BROKER_EXTERN QPID_IMPORT
+#  define QPID_BROKER_CLASS_EXTERN QPID_CLASS_IMPORT
+#  define QPID_BROKER_INLINE_EXTERN QPID_INLINE_IMPORT
 #endif
 
 #endif

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.cpp?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.cpp Thu Jul 28 18:28:56 2011
@@ -18,6 +18,7 @@
  * under the License.
  *
  */
+
 #include "qpid/broker/Connection.h"
 #include "qpid/broker/SessionOutputException.h"
 #include "qpid/broker/SessionState.h"

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Connection.h Thu Jul 28 18:28:56 2011
@@ -29,6 +29,7 @@
 
 #include <boost/ptr_container/ptr_map.hpp>
 
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/broker/ConnectionHandler.h"
 #include "qpid/broker/ConnectionState.h"
 #include "qpid/broker/SessionHandler.h"
@@ -63,7 +64,7 @@ class LinkRegistry;
 class SecureConnection;
 struct ConnectionTimeoutTask;
 
-class Connection : public sys::ConnectionInputHandler,
+class QPID_BROKER_CLASS_EXTERN Connection : public sys::ConnectionInputHandler,
                    public ConnectionState,
                    public RefCounted
 {

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ConnectionFactory.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ConnectionFactory.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ConnectionFactory.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ConnectionFactory.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,16 +22,17 @@
 #define _ConnectionFactory_
 
 #include "qpid/sys/ConnectionCodec.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 namespace qpid {
 namespace broker {
 class Broker;
 
-class ConnectionFactory : public sys::ConnectionCodec::Factory
+class QPID_BROKER_CLASS_EXTERN ConnectionFactory : public sys::ConnectionCodec::Factory
 {
   public:
     ConnectionFactory(Broker& b);
-            
+
     virtual ~ConnectionFactory();
 
     sys::ConnectionCodec*

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Daemon.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Daemon.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Daemon.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Daemon.h Thu Jul 28 18:28:56 2011
@@ -19,6 +19,7 @@
  *
  */
 
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/sys/IntegerTypes.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/function.hpp>
@@ -33,11 +34,11 @@ namespace broker {
  * Tools for forking and managing a daemon process.
  * NB: Only one Daemon instance is allowed in a process.
  */
-class Daemon : private boost::noncopyable
+class QPID_BROKER_CLASS_EXTERN Daemon : private boost::noncopyable
 {
   public:
     /** Check daemon is running on port, throw exception if not */
-    static pid_t getPid(std::string pidDir, uint16_t port);
+    QPID_BROKER_EXTERN static pid_t getPid(std::string pidDir, uint16_t port);
 
     Daemon(std::string pidDir);
 
@@ -68,7 +69,7 @@ class Daemon : private boost::noncopyabl
      *@param port returned by parent call to wait().
      */
     void ready(uint16_t port);
-    
+
   private:
     static std::string pidFile(std::string pidDir, uint16_t port);
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DeliveryRecord.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DeliveryRecord.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DeliveryRecord.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DeliveryRecord.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -42,7 +42,7 @@ struct AckRange;
 /**
  * Record of a delivery for which an ack is outstanding.
  */
-class DeliveryRecord
+class QPID_BROKER_CLASS_EXTERN DeliveryRecord
 {
     QueuedMessage msg;
     mutable boost::shared_ptr<Queue> queue;
@@ -66,16 +66,16 @@ class DeliveryRecord
 
   public:
     QPID_BROKER_EXTERN DeliveryRecord(const QueuedMessage& msg,
-                                      const boost::shared_ptr<Queue>& queue, 
+                                      const boost::shared_ptr<Queue>& queue,
                                       const std::string& tag,
                                       bool acquired,
                                       bool accepted,
                                       bool windowing,
                                       uint32_t credit=0       // Only used if msg is empty.
     );
-    
+
     bool coveredBy(const framing::SequenceSet* const range) const { return range->contains(id); }
-    
+
     void dequeue(TransactionContext* ctxt = 0) const;
     void requeue() const;
     void release(bool setRedelivered);
@@ -95,7 +95,7 @@ class DeliveryRecord
     bool isAccepted() const { return !acceptExpected; }
     bool isEnded() const { return ended; }
     bool isWindowing() const { return windowing; }
-    
+
     uint32_t getCredit() const;
     const std::string& getTag() const { return tag; }
 
@@ -132,7 +132,7 @@ typedef DeliveryRecord::DeliveryRecords 
 struct AckRange
 {
     DeliveryRecords::iterator start;
-    DeliveryRecords::iterator end;    
+    DeliveryRecords::iterator end;
     AckRange(DeliveryRecords::iterator _start, DeliveryRecords::iterator _end) : start(_start), end(_end) {}
 };
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DirectExchange.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DirectExchange.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DirectExchange.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DirectExchange.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -31,7 +31,7 @@
 
 namespace qpid {
 namespace broker {
-class DirectExchange : public virtual Exchange {
+class QPID_BROKER_CLASS_EXTERN DirectExchange : public virtual Exchange {
     typedef qpid::sys::CopyOnWriteArray<Binding::shared_ptr> Queues;
     struct BoundKey {
         Queues     queues;
@@ -43,16 +43,16 @@ class DirectExchange : public virtual Ex
 
 public:
     static const std::string typeName;
-        
+
     QPID_BROKER_EXTERN DirectExchange(const std::string& name,
                                       management::Manageable* parent = 0, Broker* broker = 0);
     QPID_BROKER_EXTERN DirectExchange(const std::string& _name,
-                                      bool _durable, 
+                                      bool _durable,
                                       const qpid::framing::FieldTable& _args,
                                       management::Manageable* parent = 0, Broker* broker = 0);
 
-    virtual std::string getType() const { return typeName; }            
-        
+    virtual std::string getType() const { return typeName; }
+
     QPID_BROKER_EXTERN virtual bool bind(boost::shared_ptr<Queue> queue,
                                          const std::string& routingKey,
                                          const qpid::framing::FieldTable* args);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxBuffer.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxBuffer.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxBuffer.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxBuffer.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,11 +27,11 @@
 
 namespace qpid {
     namespace broker {
-        class DtxBuffer : public TxBuffer{
+        class QPID_BROKER_CLASS_EXTERN DtxBuffer : public TxBuffer{
             sys::Mutex lock;
             const std::string xid;
             bool ended;
-            bool suspended;           
+            bool suspended;
             bool failed;
             bool expired;
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxTimeout.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxTimeout.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxTimeout.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxTimeout.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,13 +23,14 @@
 
 #include "qpid/Exception.h"
 #include "qpid/sys/Timer.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 namespace qpid {
 namespace broker {
 
 class DtxManager;
 
-struct DtxTimeoutException : public Exception {};
+struct QPID_BROKER_CLASS_EXTERN DtxTimeoutException : public Exception {};
 
 struct DtxTimeout : public sys::TimerTask
 {
@@ -37,7 +38,7 @@ struct DtxTimeout : public sys::TimerTas
     DtxManager& mgr;
     const std::string xid;
 
-    DtxTimeout(uint32_t timeout, DtxManager& mgr, const std::string& xid);    
+    DtxTimeout(uint32_t timeout, DtxManager& mgr, const std::string& xid);
     void fire();
 };
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxWorkRecord.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxWorkRecord.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/DtxWorkRecord.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -43,7 +43,7 @@ namespace broker {
  * across potentially multiple channels. Identified by a xid. Allows
  * that work to be prepared, committed and rolled-back.
  */
-class DtxWorkRecord
+class QPID_BROKER_CLASS_EXTERN DtxWorkRecord
 {
     typedef std::vector<DtxBuffer::shared_ptr> Work;
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,9 +40,9 @@ namespace broker {
 
 struct UnknownExchangeTypeException{};
 
-class ExchangeRegistry{
+class QPID_BROKER_CLASS_EXTERN ExchangeRegistry{
   public:
-    typedef boost::function5<Exchange::shared_ptr, const std::string&, 
+    typedef boost::function5<Exchange::shared_ptr, const std::string&,
                              bool, const qpid::framing::FieldTable&, qpid::management::Manageable*, qpid::broker::Broker*> FactoryFunction;
 
     ExchangeRegistry (Broker* b = 0) : parent(0), broker(b) {}
@@ -50,7 +50,7 @@ class ExchangeRegistry{
       (const std::string& name, const std::string& type);
     QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> declare
       (const std::string& name,
-       const std::string& type, 
+       const std::string& type,
        bool durable,
        const qpid::framing::FieldTable& args = framing::FieldTable());
     QPID_BROKER_EXTERN void destroy(const std::string& name);
@@ -75,7 +75,7 @@ class ExchangeRegistry{
         for (ExchangeMap::const_iterator i = exchanges.begin(); i != exchanges.end(); ++i)
             f(i->second);
     }
-        
+
   private:
     typedef std::map<std::string, Exchange::shared_ptr> ExchangeMap;
     typedef std::map<std::string, FactoryFunction > FunctionMap;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Fairshare.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Fairshare.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Fairshare.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Fairshare.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,6 +22,7 @@
  *
  */
 #include "qpid/broker/PriorityQueue.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 namespace qpid {
 namespace framing {
@@ -34,7 +35,7 @@ namespace broker {
  * from each priority level that are dispatched before allowing
  * dispatch from the next level.
  */
-class Fairshare : public PriorityQueue
+class QPID_BROKER_CLASS_EXTERN Fairshare : public PriorityQueue
 {
   public:
     Fairshare(size_t levels, uint limit);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/FanOutExchange.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/FanOutExchange.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/FanOutExchange.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/FanOutExchange.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,22 +32,22 @@
 namespace qpid {
 namespace broker {
 
-class FanOutExchange : public virtual Exchange {
+class QPID_BROKER_CLASS_EXTERN FanOutExchange : public virtual Exchange {
     typedef qpid::sys::CopyOnWriteArray<Binding::shared_ptr> BindingsArray;
     BindingsArray bindings;
     FedBinding fedBinding;
   public:
     static const std::string typeName;
-        
+
     QPID_BROKER_EXTERN FanOutExchange(const std::string& name,
                                       management::Manageable* parent = 0, Broker* broker = 0);
     QPID_BROKER_EXTERN FanOutExchange(const std::string& _name,
-                                      bool _durable, 
+                                      bool _durable,
                                       const qpid::framing::FieldTable& _args,
                                       management::Manageable* parent = 0, Broker* broker = 0);
 
-    virtual std::string getType() const { return typeName; }            
-        
+    virtual std::string getType() const { return typeName; }
+
     QPID_BROKER_EXTERN virtual bool bind(Queue::shared_ptr queue,
                                          const std::string& routingKey,
                                          const qpid::framing::FieldTable* args);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/HeadersExchange.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/HeadersExchange.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/HeadersExchange.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/HeadersExchange.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@ namespace qpid {
 namespace broker {
 
 
-class HeadersExchange : public virtual Exchange {
+class QPID_BROKER_CLASS_EXTERN HeadersExchange : public virtual Exchange {
 
     struct BoundKey
     {
@@ -44,12 +44,12 @@ class HeadersExchange : public virtual E
 
     struct MatchArgs
     {
-        const Queue::shared_ptr queue;        
+        const Queue::shared_ptr queue;
         const qpid::framing::FieldTable* args;
         MatchArgs(Queue::shared_ptr q, const qpid::framing::FieldTable* a);
         bool operator()(BoundKey & bk);
     };
-    
+
     struct MatchKey
     {
         const Queue::shared_ptr queue;
@@ -86,12 +86,12 @@ class HeadersExchange : public virtual E
     QPID_BROKER_EXTERN HeadersExchange(const std::string& name,
                                        management::Manageable* parent = 0, Broker* broker = 0);
     QPID_BROKER_EXTERN HeadersExchange(const std::string& _name,
-                                       bool _durable, 
+                                       bool _durable,
                                        const qpid::framing::FieldTable& _args,
                                        management::Manageable* parent = 0, Broker* broker = 0);
-    
-    virtual std::string getType() const { return typeName; }            
-        
+
+    virtual std::string getType() const { return typeName; }
+
     QPID_BROKER_EXTERN virtual bool bind(Queue::shared_ptr queue,
                                          const std::string& routingKey,
                                          const qpid::framing::FieldTable* args);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Link.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Link.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Link.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Link.h Thu Jul 28 18:28:56 2011
@@ -32,6 +32,7 @@
 #include "qpid/management/Manageable.h"
 #include "qpid/management/ManagementAgent.h"
 #include "qmf/org/apache/qpid/broker/Link.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 namespace qpid {
@@ -41,7 +42,8 @@ namespace qpid {
         class Broker;
         class Connection;
 
-        class Link : public PersistableConfig, public management::Manageable {
+        class QPID_BROKER_CLASS_EXTERN Link :
+            public PersistableConfig, public management::Manageable {
         private:
             sys::Mutex          lock;
             LinkRegistry*       links;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/LinkRegistry.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/LinkRegistry.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/LinkRegistry.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/LinkRegistry.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,6 +29,7 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Timer.h"
 #include "qpid/management/Manageable.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/function.hpp>
@@ -39,7 +40,7 @@ namespace broker {
     class Link;
     class Broker;
     class Connection;
-    class LinkRegistry {
+    class QPID_BROKER_CLASS_EXTERN LinkRegistry {
 
         // Declare a timer task to manage the establishment of link connections and the
         // re-establishment of lost link connections.
@@ -150,7 +151,7 @@ namespace broker {
          */
         void setPassive(bool);
 
-        
+
         /** Iterate over each link in the registry. Used for cluster updates. */
         void eachLink(boost::function<void(boost::shared_ptr<Link>)> f);
         /** Iterate over each bridge in the registry. Used for cluster updates. */

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Message.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Message.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Message.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,12 +34,12 @@
 #include <vector>
 
 namespace qpid {
-       
+
 namespace framing {
 class FieldTable;
 class SequenceNumber;
 }
-       
+
 namespace broker {
 class ConnectionToken;
 class Exchange;
@@ -48,14 +48,14 @@ class MessageStore;
 class Queue;
 class ExpiryPolicy;
 
-class Message : public PersistableMessage {
+class QPID_BROKER_CLASS_EXTERN Message : public PersistableMessage {
 public:
     typedef boost::function<void (const boost::intrusive_ptr<Message>&)> MessageCallback;
-    
+
     QPID_BROKER_EXTERN Message(const framing::SequenceNumber& id = framing::SequenceNumber());
     QPID_BROKER_EXTERN Message(const Message&);
     QPID_BROKER_EXTERN ~Message();
-        
+
     uint64_t getPersistenceId() const { return persistenceId; }
     void setPersistenceId(uint64_t _persistenceId) const { persistenceId = _persistenceId; }
 
@@ -85,8 +85,8 @@ public:
     sys::AbsTime getExpiration() const { return expiration; }
     void adjustTtl();
 
-    framing::FrameSet& getFrames() { return frames; } 
-    const framing::FrameSet& getFrames() const { return frames; } 
+    framing::FrameSet& getFrames() { return frames; }
+    const framing::FrameSet& getFrames() const { return frames; }
 
     template <class T> T* getProperties() {
         qpid::framing::AMQHeaderBody* p = frames.getHeaders();
@@ -135,7 +135,7 @@ public:
 
     QPID_BROKER_EXTERN void decodeHeader(framing::Buffer& buffer);
     QPID_BROKER_EXTERN void decodeContent(framing::Buffer& buffer);
-            
+
     void QPID_BROKER_EXTERN tryReleaseContent();
     void releaseContent();
     void releaseContent(MessageStore* s);//deprecated, use 'setStore(store); releaseContent();' instead
@@ -149,10 +149,10 @@ public:
 
     bool isExcluded(const std::vector<std::string>& excludes) const;
     void addTraceId(const std::string& id);
-       
+
        void forcePersistent();
        bool isForcedPersistent();
-    
+
 
     /** Call cb when dequeue is complete, may call immediately. Holds cb by reference. */
     void setDequeueCompleteCallback(MessageCallback& cb);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/PersistableMessage.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/PersistableMessage.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -41,7 +41,7 @@ class MessageStore;
 /**
  * Base class for persistable messages.
  */
-class PersistableMessage : public Persistable
+class QPID_BROKER_CLASS_EXTERN PersistableMessage : public Persistable
 {
     typedef std::list< boost::weak_ptr<PersistableQueue> > syncList;
     sys::Mutex asyncDequeueLock;
@@ -75,7 +75,7 @@ class PersistableMessage : public Persis
         bool blocked;
         bool requested;
         bool released;
-        
+
         ContentReleaseState();
     };
     ContentReleaseState contentReleaseState;
@@ -102,7 +102,7 @@ class PersistableMessage : public Persis
     PersistableMessage();
 
     void flush();
-    
+
     QPID_BROKER_EXTERN bool isContentReleased() const;
 
     QPID_BROKER_EXTERN void setStore(MessageStore*);
@@ -126,14 +126,14 @@ class PersistableMessage : public Persis
 
 
     QPID_BROKER_EXTERN bool isDequeueComplete();
-    
+
     QPID_BROKER_EXTERN void dequeueComplete();
 
     QPID_BROKER_EXTERN void dequeueAsync(PersistableQueue::shared_ptr queue,
                                          MessageStore* _store);
 
     bool isStoredOnQueue(PersistableQueue::shared_ptr queue);
-    
+
     void addToSyncList(PersistableQueue::shared_ptr queue, MessageStore* _store);
 };
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Queue.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/Queue.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -67,20 +67,21 @@ class Exchange;
  * registered consumers or be stored until dequeued or until one
  * or more consumers registers.
  */
-class Queue : public boost::enable_shared_from_this<Queue>,
-              public PersistableQueue, public management::Manageable {
-
+class QPID_BROKER_CLASS_EXTERN Queue :
+        public boost::enable_shared_from_this<Queue>,
+        public PersistableQueue, public management::Manageable
+{
     struct UsageBarrier
     {
         Queue& parent;
         uint count;
-                
+
         UsageBarrier(Queue&);
         bool acquire();
         void release();
         void destroy();
     };
-            
+
     struct ScopedUse
     {
         UsageBarrier& barrier;
@@ -88,7 +89,7 @@ class Queue : public boost::enable_share
         ScopedUse(UsageBarrier& b) : barrier(b), acquired(barrier.acquire()) {}
         ~ScopedUse() { if (acquired) barrier.release(); }
     };
-            
+
     typedef std::set< boost::shared_ptr<QueueObserver> > Observers;
     enum ConsumeCode {NO_MESSAGES=0, CANT_CONSUME=1, CONSUMED=2};
 
@@ -184,8 +185,8 @@ class Queue : public boost::enable_share
     typedef std::vector<shared_ptr> vector;
 
     QPID_BROKER_EXTERN Queue(const std::string& name,
-                             bool autodelete = false, 
-                             MessageStore* const store = 0, 
+                             bool autodelete = false,
+                             MessageStore* const store = 0,
                              const OwnershipToken* const owner = 0,
                              management::Manageable* parent = 0,
                              Broker* broker = 0);
@@ -245,11 +246,11 @@ class Queue : public boost::enable_share
                                     bool exclusive = false);
     QPID_BROKER_EXTERN void cancel(Consumer::shared_ptr c);
 
-    uint32_t purge(const uint32_t purge_request=0, boost::shared_ptr<Exchange> dest=boost::shared_ptr<Exchange>()); //defaults to all messages 
+    uint32_t purge(const uint32_t purge_request=0, boost::shared_ptr<Exchange> dest=boost::shared_ptr<Exchange>()); //defaults to all messages
     QPID_BROKER_EXTERN void purgeExpired();
 
     //move qty # of messages to destination Queue destq
-    uint32_t move(const Queue::shared_ptr destq, uint32_t qty); 
+    uint32_t move(const Queue::shared_ptr destq, uint32_t qty);
 
     QPID_BROKER_EXTERN uint32_t getMessageCount() const;
     QPID_BROKER_EXTERN uint32_t getEnqueueCompleteMessageCount() const;
@@ -288,8 +289,8 @@ class Queue : public boost::enable_share
      * Inform queue of messages that were enqueued, have since
      * been acquired but not yet accepted or released (and
      * thus are still logically on the queue) - used in
-     * clustered broker.  
-     */ 
+     * clustered broker.
+     */
     void updateEnqueued(const QueuedMessage& msg);
 
     /**
@@ -300,20 +301,20 @@ class Queue : public boost::enable_share
      * accepted it).
      */
     bool isEnqueued(const QueuedMessage& msg);
-            
+
     /**
-     * Gets the next available message 
+     * Gets the next available message
      */
     QPID_BROKER_EXTERN QueuedMessage get();
 
     /** Get the message at position pos */
     QPID_BROKER_EXTERN QueuedMessage find(framing::SequenceNumber pos) const;
 
-    const QueuePolicy* getPolicy();
+    QPID_BROKER_EXTERN const QueuePolicy* getPolicy();
 
-    void setAlternateExchange(boost::shared_ptr<Exchange> exchange);
-    boost::shared_ptr<Exchange> getAlternateExchange();
-    bool isLocal(boost::intrusive_ptr<Message>& msg);
+    QPID_BROKER_EXTERN void setAlternateExchange(boost::shared_ptr<Exchange> exchange);
+    QPID_BROKER_EXTERN boost::shared_ptr<Exchange> getAlternateExchange();
+    QPID_BROKER_EXTERN bool isLocal(boost::intrusive_ptr<Message>& msg);
 
     //PersistableQueue support:
     uint64_t getPersistenceId() const;
@@ -361,7 +362,7 @@ class Queue : public boost::enable_share
     /** return current position sequence number for the next message on the queue.
      */
     QPID_BROKER_EXTERN framing::SequenceNumber getPosition();
-    void addObserver(boost::shared_ptr<QueueObserver>);
+    QPID_BROKER_EXTERN void addObserver(boost::shared_ptr<QueueObserver>);
     QPID_BROKER_EXTERN void insertSequenceNumbers(const std::string& key);
     /**
      * Notify queue that recovery has completed.
@@ -369,9 +370,9 @@ class Queue : public boost::enable_share
     void recoveryComplete(ExchangeRegistry& exchanges);
 
     // For cluster update
-    QueueListeners& getListeners();
-    Messages& getMessages();
-    const Messages& getMessages() const;
+    QPID_BROKER_EXTERN QueueListeners& getListeners();
+    QPID_BROKER_EXTERN Messages& getMessages();
+    QPID_BROKER_EXTERN const Messages& getMessages() const;
 
     /**
      * Reserve space in policy for an enqueued message that

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueCleaner.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueCleaner.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueCleaner.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueCleaner.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -32,7 +32,7 @@ class QueueRegistry;
 /**
  * TimerTask to purge expired messages from queues
  */
-class QueueCleaner
+class QPID_BROKER_CLASS_EXTERN QueueCleaner
 {
   public:
     QPID_BROKER_EXTERN QueueCleaner(QueueRegistry& queues, sys::Timer& timer);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueEvents.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueEvents.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueEvents.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueEvents.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,7 +39,7 @@ namespace broker {
  * of this. The notification happens asynchronously, in a separate
  * thread.
  */
-class QueueEvents
+class QPID_BROKER_CLASS_EXTERN QueueEvents
 {
   public:
     enum EventType {ENQUEUE, DEQUEUE};
@@ -76,7 +76,7 @@ class QueueEvents
     volatile bool enabled;
     qpid::sys::Mutex lock;//protect listeners from concurrent access
     bool sync;
-    
+
     EventQueue::Batch::const_iterator handle(const EventQueue::Batch& e);
 
 };

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueFlowLimit.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueFlowLimit.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueFlowLimit.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -53,7 +53,8 @@ class Broker;
  * passing _either_ level may turn flow control ON, but _both_ must be
  * below level before flow control will be turned OFF.
  */
- class QueueFlowLimit : public StatefulQueueObserver
+// Note must be EXTERN because it is used by tests.
+ class QPID_BROKER_CLASS_EXTERN QueueFlowLimit : public StatefulQueueObserver
 {
     static uint64_t defaultMaxSize;
     static uint defaultFlowStopRatio;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueListeners.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueListeners.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueListeners.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueListeners.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,6 +22,7 @@
  *
  */
 #include "qpid/broker/Consumer.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include <deque>
 
 namespace qpid {
@@ -30,14 +31,14 @@ namespace broker {
 /**
  * Track and notify components that wish to be notified of messages
  * that become available on a queue.
- * 
+ *
  * None of the methods defined here are protected by locking. However
  * the populate method allows a 'snapshot' to be taken of the
  * listeners to be notified. NotificationSet::notify() may then be
  * called outside of any lock that protects the QueueListeners
  * instance from concurrent access.
  */
-class QueueListeners
+class QPID_BROKER_CLASS_EXTERN QueueListeners
 {
   public:
     typedef std::deque<Consumer::shared_ptr> Listeners;
@@ -61,8 +62,8 @@ class QueueListeners
       friend class QueueListeners;
     };
 
-    void addListener(Consumer::shared_ptr);    
-    void removeListener(Consumer::shared_ptr);    
+    void addListener(Consumer::shared_ptr);
+    void removeListener(Consumer::shared_ptr);
     void populate(NotificationSet&);
     void snapshot(ListenerSet&);
     bool contains(Consumer::shared_ptr c) const;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueuePolicy.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueuePolicy.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueuePolicy.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueuePolicy.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,7 +33,7 @@
 namespace qpid {
 namespace broker {
 
-class QueuePolicy
+class QPID_BROKER_CLASS_EXTERN QueuePolicy
 {
     static uint64_t defaultMaxSize;
 
@@ -43,11 +43,11 @@ class QueuePolicy
     uint32_t count;
     uint64_t size;
     bool policyExceeded;
-            
+
     static uint32_t getCapacity(const qpid::framing::FieldTable& settings, const std::string& key, uint32_t defaultValue);
 
   protected:
-    uint64_t getCurrentQueueSize() const { return size; } 
+    uint64_t getCurrentQueueSize() const { return size; }
 
   public:
     typedef std::deque<QueuedMessage> Messages;
@@ -57,7 +57,7 @@ class QueuePolicy
     static QPID_BROKER_EXTERN const std::string REJECT;
     static QPID_BROKER_EXTERN const std::string FLOW_TO_DISK;
     static QPID_BROKER_EXTERN const std::string RING;
-    static QPID_BROKER_EXTERN const std::string RING_STRICT;            
+    static QPID_BROKER_EXTERN const std::string RING_STRICT;
 
     virtual ~QueuePolicy() {}
     QPID_BROKER_EXTERN void tryEnqueue(boost::intrusive_ptr<Message> msg);
@@ -68,7 +68,7 @@ class QueuePolicy
     virtual bool isEnqueued(const QueuedMessage&);
     QPID_BROKER_EXTERN void update(qpid::framing::FieldTable& settings);
     uint32_t getMaxCount() const { return maxCount; }
-    uint64_t getMaxSize() const { return maxSize; }           
+    uint64_t getMaxSize() const { return maxSize; }
     void encode(framing::Buffer& buffer) const;
     void decode ( framing::Buffer& buffer );
     uint32_t encodedSize() const;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueRegistry.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueRegistry.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueRegistry.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/QueueRegistry.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -47,7 +47,7 @@ class MessageStore;
  * are deleted when and only when they are no longer in use.
  *
  */
-class QueueRegistry {
+class QPID_BROKER_CLASS_EXTERN QueueRegistry {
   public:
     QPID_BROKER_EXTERN QueueRegistry(Broker* b = 0);
     QPID_BROKER_EXTERN ~QueueRegistry();
@@ -61,7 +61,7 @@ class QueueRegistry {
     QPID_BROKER_EXTERN std::pair<boost::shared_ptr<Queue>, bool> declare(
         const std::string& name,
         bool durable = false,
-        bool autodelete = false, 
+        bool autodelete = false,
         const OwnershipToken* owner = 0,
         boost::shared_ptr<Exchange> alternateExchange = boost::shared_ptr<Exchange>(),
         const qpid::framing::FieldTable& args = framing::FieldTable(),
@@ -122,13 +122,13 @@ class QueueRegistry {
         for (QueueMap::const_iterator i = queues.begin(); i != queues.end(); ++i)
             f(i->second);
     }
-	
+
 	/**
 	* Change queue mode when cluster size drops to 1 node, expands again
 	* in practice allows flow queue to disk when last name to be exectuted
 	*/
 	void updateQueueClusterState(bool lastNode);
-    
+
 private:
     typedef std::map<std::string, boost::shared_ptr<Queue> > QueueMap;
     QueueMap queues;
@@ -144,7 +144,7 @@ private:
     void destroyLH (const std::string& name);
 };
 
-    
+
 }} // namespace qpid::broker
 
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredDequeue.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredDequeue.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredDequeue.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,6 +25,7 @@
 #include "qpid/broker/Message.h"
 #include "qpid/broker/MessageStore.h"
 #include "qpid/broker/TxOp.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 #include <boost/intrusive_ptr.hpp>
 
@@ -34,7 +35,7 @@
 
 namespace qpid {
     namespace broker {
-        class RecoveredDequeue : public TxOp{
+        class QPID_BROKER_CLASS_EXTERN RecoveredDequeue : public TxOp{
             boost::shared_ptr<Queue> queue;
             boost::intrusive_ptr<Message> msg;
 

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,6 +25,7 @@
 #include "qpid/broker/Message.h"
 #include "qpid/broker/MessageStore.h"
 #include "qpid/broker/TxOp.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 #include <boost/intrusive_ptr.hpp>
 
@@ -34,7 +35,7 @@
 
 namespace qpid {
 namespace broker {
-class RecoveredEnqueue : public TxOp{
+class QPID_BROKER_CLASS_EXTERN RecoveredEnqueue : public TxOp{
     boost::shared_ptr<Queue> queue;
     boost::intrusive_ptr<Message> msg;
 
@@ -48,7 +49,7 @@ class RecoveredEnqueue : public TxOp{
 
     boost::shared_ptr<Queue> getQueue() const { return queue; }
     boost::intrusive_ptr<Message> getMessage() const { return msg; }
-            
+
 };
 }
 }

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RetryList.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RetryList.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RetryList.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/RetryList.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -33,10 +33,10 @@ namespace broker {
  * Simple utility for managing a list of urls to try on reconnecting a
  * link. Currently only supports TCP urls.
  */
-class RetryList
+class QPID_BROKER_CLASS_EXTERN RetryList
 {
   public:
-    QPID_BROKER_EXTERN RetryList();                
+    QPID_BROKER_EXTERN RetryList();
     QPID_BROKER_EXTERN void reset(const std::vector<Url>& urls);
     QPID_BROKER_EXTERN bool next(Address& address);
   private:

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SecureConnection.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SecureConnection.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SecureConnection.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SecureConnection.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,6 +22,7 @@
  *
  */
 
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/sys/ConnectionCodec.h"
 #include <memory>
 
@@ -38,7 +39,7 @@ namespace broker {
  * 'secured' e.g. encrypted based on settings negotiatiated at the
  * time of establishment.
  */
-class SecureConnection : public qpid::sys::ConnectionCodec
+class QPID_BROKER_CLASS_EXTERN SecureConnection : public qpid::sys::ConnectionCodec
 {
   public:
     SecureConnection();

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SemanticState.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SemanticState.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SemanticState.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SemanticState.h Thu Jul 28 18:28:56 2011
@@ -22,6 +22,7 @@
  *
  */
 
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/broker/Consumer.h"
 #include "qpid/broker/Deliverable.h"
 #include "qpid/broker/DeliveryAdapter.h"
@@ -65,9 +66,9 @@ class SessionContext;
  *
  * Message delivery is driven by ConsumerImpl::doOutput(), which is
  * called when a client's socket is ready to write data.
- * 
+ *
  */
-class SemanticState : private boost::noncopyable {
+class QPID_BROKER_CLASS_EXTERN SemanticState : private boost::noncopyable {
   public:
     class ConsumerImpl : public Consumer, public sys::OutputTask,
                          public boost::enable_shared_from_this<ConsumerImpl>,
@@ -99,15 +100,15 @@ class SemanticState : private boost::non
       public:
         typedef boost::shared_ptr<ConsumerImpl> shared_ptr;
 
-        ConsumerImpl(SemanticState* parent, 
+        ConsumerImpl(SemanticState* parent,
                      const std::string& name, boost::shared_ptr<Queue> queue,
                      bool ack, bool acquire, bool exclusive,
                      const std::string& resumeId, uint64_t resumeTtl, const framing::FieldTable& arguments);
         ~ConsumerImpl();
         OwnershipToken* getSession();
-        bool deliver(QueuedMessage& msg);            
-        bool filter(boost::intrusive_ptr<Message> msg);            
-        bool accept(boost::intrusive_ptr<Message> msg);            
+        bool deliver(QueuedMessage& msg);
+        bool filter(boost::intrusive_ptr<Message> msg);
+        bool accept(boost::intrusive_ptr<Message> msg);
 
         void disableNotify();
         void enableNotify();
@@ -122,7 +123,7 @@ class SemanticState : private boost::non
         void addMessageCredit(uint32_t value);
         void flush();
         void stop();
-        void complete(DeliveryRecord&);    
+        void complete(DeliveryRecord&);
         boost::shared_ptr<Queue> getQueue() const { return queue; }
         bool isBlocked() const { return blocked; }
         bool setBlocked(bool set) { std::swap(set, blocked); return set; }
@@ -188,7 +189,7 @@ class SemanticState : private boost::non
     const SessionContext& getSession() const { return session; }
 
     ConsumerImpl& find(const std::string& destination);
-    
+
     /**
      * Get named queue, never returns 0.
      * @return: named queue
@@ -196,11 +197,11 @@ class SemanticState : private boost::non
      * @exception: ConnectionException if name="" and session has no default.
      */
     boost::shared_ptr<Queue> getQueue(const std::string& name) const;
-    
+
     bool exists(const std::string& consumerTag);
 
-    void consume(const std::string& destination, 
-                 boost::shared_ptr<Queue> queue, 
+    void consume(const std::string& destination,
+                 boost::shared_ptr<Queue> queue,
                  bool ackRequired, bool acquire, bool exclusive,
                  const std::string& resumeId=std::string(), uint64_t resumeTtl=0,
                  const framing::FieldTable& = framing::FieldTable());
@@ -223,7 +224,7 @@ class SemanticState : private boost::non
     void suspendDtx(const std::string& xid);
     void resumeDtx(const std::string& xid);
     void recover(bool requeue);
-    void deliver(DeliveryRecord& message, bool sync);            
+    void deliver(DeliveryRecord& message, bool sync);
     void acquire(DeliveryId first, DeliveryId last, DeliveryIds& acquired);
     void release(DeliveryId first, DeliveryId last, bool setRedelivered);
     void reject(DeliveryId first, DeliveryId last);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SignalHandler.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SignalHandler.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SignalHandler.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/SignalHandler.h Thu Jul 28 18:28:56 2011
@@ -10,9 +10,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,6 +22,8 @@
  *
  */
 
+#include "qpid/broker/BrokerImportExport.h"
+
 namespace qpid {
 namespace broker {
 
@@ -30,7 +32,7 @@ class Broker;
 /**
  * Handle signals e.g. to shut-down a broker.
  */
-class SignalHandler
+class QPID_BROKER_CLASS_EXTERN SignalHandler
 {
   public:
     /** Set the broker to be shutdown on signals.

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TopicExchange.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TopicExchange.h Thu Jul 28 18:28:56 2011
@@ -33,7 +33,7 @@
 namespace qpid {
 namespace broker {
 
-class TopicExchange : public virtual Exchange {
+class QPID_BROKER_CLASS_EXTERN TopicExchange : public virtual Exchange {
 
     struct TokenIterator;
     class Normalizer;
@@ -141,7 +141,7 @@ class TopicExchange : public virtual Exc
     private:
         qpid::sys::RWlock* cacheLock;
         std::map<std::string, BindingList>* bindingCache;
-	bool cleared; 
+	bool cleared;
     public:
         ClearCache(qpid::sys::RWlock* l, std::map<std::string, BindingList>* bc): cacheLock(l),
              bindingCache(bc),cleared(false) {};
@@ -152,7 +152,7 @@ class TopicExchange : public virtual Exc
                  cleared =true;
              }
         };
-        ~ClearCache(){ 
+        ~ClearCache(){
 	     clearCache();
         };
     };

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxAccept.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxAccept.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxAccept.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxAccept.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,6 +27,7 @@
 #include "qpid/framing/SequenceSet.h"
 #include "qpid/broker/DeliveryRecord.h"
 #include "qpid/broker/TxOp.h"
+#include "qpid/broker/BrokerImportExport.h"
 
 namespace qpid {
     namespace broker {
@@ -34,11 +35,11 @@ namespace qpid {
          * Defines the transactional behaviour for accepts received by
          * a transactional channel.
          */
-        class TxAccept : public TxOp {
+        class QPID_BROKER_CLASS_EXTERN TxAccept : public TxOp {
             struct RangeOp
             {
                 AckRange range;
-    
+
                 RangeOp(const AckRange& r);
                 void prepare(TransactionContext* ctxt);
                 void commit();
@@ -48,12 +49,12 @@ namespace qpid {
             {
                 std::vector<RangeOp> ranges;
                 DeliveryRecords& unacked;
-    
+
                 RangeOps(DeliveryRecords& u);
 
                 void operator()(framing::SequenceNumber start, framing::SequenceNumber end);
                 void prepare(TransactionContext* ctxt);
-                void commit();    
+                void commit();
             };
 
             framing::SequenceSet acked;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxBuffer.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxBuffer.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxBuffer.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/broker/TxBuffer.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,21 +34,21 @@
  * transaction. This work can be committed or rolled back. Committing
  * is a two-stage process: first all the operations should be
  * prepared, then if that succeeds they can be committed.
- * 
+ *
  * In the 2pc case, a successful prepare may be followed by either a
  * commit or a rollback.
- * 
+ *
  * Atomicity of prepare is ensured by using a lower level
  * transactional facility. This saves explicitly rolling back all the
  * successfully prepared ops when one of them fails. i.e. we do not
  * use 2pc internally, we instead ensure that prepare is atomic at a
  * lower level. This makes individual prepare operations easier to
  * code.
- * 
+ *
  * Transactions on a messaging broker effect three types of 'action':
  * (1) updates to persistent storage (2) updates to transient storage
  * or cached data (3) network writes.
- * 
+ *
  * Of these, (1) should always occur atomically during prepare to
  * ensure that if the broker crashes while a transaction is being
  * completed the persistent state (which is all that then remains) is
@@ -59,7 +59,7 @@
  */
 namespace qpid {
     namespace broker {
-        class TxBuffer{
+        class QPID_BROKER_CLASS_EXTERN TxBuffer {
             typedef std::vector<TxOp::shared_ptr>::iterator op_iterator;
             std::vector<TxOp::shared_ptr> ops;
         protected:
@@ -78,7 +78,7 @@ namespace qpid {
              *
              * Once prepared, a transaction can be committed (or in
              * the 2pc case, rolled back).
-             * 
+             *
              * @returns true if all the operations prepared
              * successfully, false if not.
              */
@@ -88,7 +88,7 @@ namespace qpid {
              * Signals that the ops all prepared successfully and can
              * now commit, i.e. the operation can now be fully carried
              * out.
-             * 
+             *
              * Should only be called after a call to prepare() returns
              * true.
              */
@@ -96,7 +96,7 @@ namespace qpid {
 
             /**
              * Signals that all ops can be rolled back.
-             * 
+             *
              * Should only be called either after a call to prepare()
              * returns true (2pc) or instead of a prepare call
              * ('server-local')

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Bounds.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Bounds.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Bounds.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Bounds.h Thu Jul 28 18:28:56 2011
@@ -9,9 +9,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,11 +21,12 @@
  *
  */
 #include "qpid/sys/Waitable.h"
+#include "qpid/client/ClientImportExport.h"
 
 namespace qpid{
 namespace client{
 
-class Bounds
+class QPID_CLIENT_CLASS_EXTERN Bounds
 {
   public:
     Bounds(size_t maxSize);
@@ -33,7 +34,7 @@ class Bounds
     void reduce(size_t);
     size_t getCurrentSize();
     void setException(const sys::ExceptionHolder&);
-    
+
   private:
     friend std::ostream& operator<<(std::ostream&, const Bounds&);
     sys::Waitable lock;

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/ConnectionImpl.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/ConnectionImpl.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/ConnectionImpl.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/ConnectionImpl.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,6 +22,7 @@
 #ifndef _ConnectionImpl_
 #define _ConnectionImpl_
 
+#include "qpid/client/ClientImportExport.h"
 #include "qpid/client/Bounds.h"
 #include "qpid/client/ConnectionHandler.h"
 
@@ -44,9 +45,11 @@ class Connector;
 struct ConnectionSettings;
 class SessionImpl;
 
-class ConnectionImpl : public Bounds,
+// TODO aconway 2011-04-05: exposed for use by cluster::UpdateClient,
+// clean up dependencies.
+class QPID_CLIENT_CLASS_EXTERN ConnectionImpl : public Bounds,
                        public framing::FrameHandler,
-                       public sys::TimeoutHandler, 
+                       public sys::TimeoutHandler,
                        public sys::ShutdownHandler,
                        public boost::enable_shared_from_this<ConnectionImpl>
 {
@@ -54,7 +57,7 @@ class ConnectionImpl : public Bounds,
 
     static const uint16_t NEXT_CHANNEL;
 
-    SessionMap sessions; 
+    SessionMap sessions;
     ConnectionHandler handler;
     boost::scoped_ptr<Connector> connector;
     framing::ProtocolVersion version;
@@ -82,13 +85,13 @@ class ConnectionImpl : public Bounds,
     static void init();
     static boost::shared_ptr<ConnectionImpl> create(framing::ProtocolVersion version, const ConnectionSettings& settings);
     ~ConnectionImpl();
-    
+
     void open();
     bool isOpen() const;
 
     boost::shared_ptr<SessionImpl> newSession(const std::string& name, uint32_t timeout, uint16_t channel=NEXT_CHANNEL);
     void addSession(const boost::shared_ptr<SessionImpl>&, uint16_t channel=NEXT_CHANNEL);
-        
+
     void close();
     void handle(framing::AMQFrame& frame);
     void erase(uint16_t channel);

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Connector.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Connector.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Connector.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Connector.h Thu Jul 28 18:28:56 2011
@@ -24,6 +24,7 @@
 
 #include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/ProtocolVersion.h"
+#include "qpid/client/ClientImportExport.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -49,7 +50,7 @@ struct ConnectionSettings;
 class ConnectionImpl;
 
 ///@internal
-class Connector : public framing::OutputHandler
+class QPID_CLIENT_CLASS_EXTERN Connector : public framing::OutputHandler
 {
   public:
     // Protocol connector factory related stuff (it might be better to separate this code from the TCP Connector in the future)

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Demux.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Demux.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Demux.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Demux.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -43,7 +43,7 @@ public:
 };
 
 ///@internal
-class Demux
+class QPID_CLIENT_CLASS_EXTERN Demux
 {
 public:
     typedef boost::function<bool(const framing::FrameSet&)> Condition;
@@ -52,7 +52,7 @@ public:
 
     QPID_CLIENT_EXTERN Demux();
     QPID_CLIENT_EXTERN ~Demux();
-    
+
     QPID_CLIENT_EXTERN void handle(framing::FrameSet::shared_ptr);
     QPID_CLIENT_EXTERN void close(const sys::ExceptionHolder& ex);
     QPID_CLIENT_EXTERN void open();

Modified: qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Dispatcher.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Dispatcher.h?rev=1151956&r1=1151955&r2=1151956&view=diff
==============================================================================
--- qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Dispatcher.h (original)
+++ qpid/branches/qpid-3163/qpid/cpp/src/qpid/client/Dispatcher.h Thu Jul 28 18:28:56 2011
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -43,7 +43,7 @@ class SubscriptionImpl;
 typedef framing::Handler<framing::FrameSet> FrameSetHandler;
 
 ///@internal
-class Dispatcher : public sys::Runnable
+class QPID_CLIENT_CLASS_EXTERN Dispatcher : public sys::Runnable
 {
     typedef std::map<std::string, boost::intrusive_ptr<SubscriptionImpl>  >Listeners;
     sys::Mutex lock;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message