You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/07/14 16:32:53 UTC

svn commit: r793909 [2/5] - in /qpid/trunk/qpid/cpp: rubygen/0-10/ rubygen/framing.0-10/ src/ src/qmf/ src/qpid/ src/qpid/agent/ src/qpid/amqp_0_10/ src/qpid/broker/ src/qpid/client/ src/qpid/cluster/ src/qpid/console/ src/qpid/framing/ src/qpid/log/ s...

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "SemanticState.h"
-#include "SessionContext.h"
-#include "ConnectionState.h"
+#include "qpid/broker/SemanticState.h"
+#include "qpid/broker/SessionContext.h"
+#include "qpid/broker/ConnectionState.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "HeadersExchange.h"
+#include "qpid/broker/HeadersExchange.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/log/Statement.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h Tue Jul 14 14:32:39 2009
@@ -22,12 +22,12 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include "BrokerImportExport.h"
-#include "Exchange.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/CopyOnWriteArray.h"
 #include "qpid/sys/Mutex.h"
-#include "Queue.h"
+#include "qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "IncompleteMessageList.h"
+#include "qpid/broker/IncompleteMessageList.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/IncompleteMessageList.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef _IncompleteMessageList_
 #define _IncompleteMessageList_
 
-#include "BrokerImportExport.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/broker/Message.h"
 #include <boost/intrusive_ptr.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp Tue Jul 14 14:32:39 2009
@@ -19,17 +19,17 @@
  *
  */
 
-#include "Link.h"
-#include "LinkRegistry.h"
-#include "Broker.h"
-#include "Connection.h"
+#include "qpid/broker/Link.h"
+#include "qpid/broker/LinkRegistry.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Connection.h"
 #include "qmf/org/apache/qpid/broker/EventBrokerLinkUp.h"
 #include "qmf/org/apache/qpid/broker/EventBrokerLinkDown.h"
 #include "boost/bind.hpp"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/enum.h"
 #include "qpid/framing/reply_exceptions.h"
-#include "AclModule.h"
+#include "qpid/broker/AclModule.h"
 
 using namespace qpid::broker;
 using qpid::framing::Buffer;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Link.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Link.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Link.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Link.h Tue Jul 14 14:32:39 2009
@@ -23,10 +23,10 @@
  */
 
 #include <boost/shared_ptr.hpp>
-#include "MessageStore.h"
-#include "PersistableConfig.h"
-#include "Bridge.h"
-#include "RetryList.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/PersistableConfig.h"
+#include "qpid/broker/Bridge.h"
+#include "qpid/broker/RetryList.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/management/Manageable.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Tue Jul 14 14:32:39 2009
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "LinkRegistry.h"
-#include "Link.h"
-#include "Connection.h"
+#include "qpid/broker/LinkRegistry.h"
+#include "qpid/broker/Link.h"
+#include "qpid/broker/Connection.h"
 #include "qpid/log/Statement.h"
 #include <iostream>
 #include <boost/format.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.h Tue Jul 14 14:32:39 2009
@@ -23,9 +23,9 @@
  */
 
 #include <map>
-#include "Bridge.h"
-#include "MessageStore.h"
-#include "Timer.h"
+#include "qpid/broker/Bridge.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/Timer.h"
 #include "qpid/Address.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/management/Manageable.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "Message.h"
-#include "ExchangeRegistry.h"
-#include "ExpiryPolicy.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/ExchangeRegistry.h"
+#include "qpid/broker/ExpiryPolicy.h"
 #include "qpid/StringUtils.h"
 #include "qpid/framing/frame_functors.h"
 #include "qpid/framing/FieldTable.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Tue Jul 14 14:32:39 2009
@@ -22,9 +22,9 @@
  *
  */
 
-#include "BrokerImportExport.h"
-#include "PersistableMessage.h"
-#include "MessageAdapter.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/PersistableMessage.h"
+#include "qpid/broker/MessageAdapter.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Time.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageAdapter.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "MessageAdapter.h"
+#include "qpid/broker/MessageAdapter.h"
 
 #include "qpid/framing/DeliveryProperties.h"
 #include "qpid/framing/MessageProperties.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp Tue Jul 14 14:32:39 2009
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "MessageBuilder.h"
+#include "qpid/broker/MessageBuilder.h"
 
-#include "Message.h"
-#include "MessageStore.h"
-#include "NullMessageStore.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/NullMessageStore.h"
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/framing/reply_exceptions.h"
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef _MessageBuilder_
 #define _MessageBuilder_
 
-#include "BrokerImportExport.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/RefCounted.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Tue Jul 14 14:32:39 2009
@@ -21,12 +21,12 @@
 #ifndef _MessageStore_
 #define _MessageStore_
 
-#include "PersistableExchange.h"
-#include "PersistableMessage.h"
-#include "PersistableQueue.h"
-#include "PersistableConfig.h"
-#include "RecoveryManager.h"
-#include "TransactionalStore.h"
+#include "qpid/broker/PersistableExchange.h"
+#include "qpid/broker/PersistableMessage.h"
+#include "qpid/broker/PersistableQueue.h"
+#include "qpid/broker/PersistableConfig.h"
+#include "qpid/broker/RecoveryManager.h"
+#include "qpid/broker/TransactionalStore.h"
 #include "qpid/framing/FieldTable.h"
 
 #include <qpid/Options.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "MessageStoreModule.h"
-#include "NullMessageStore.h"
+#include "qpid/broker/MessageStoreModule.h"
+#include "qpid/broker/NullMessageStore.h"
 #include <iostream>
 
 // This transfer protects against the unloading of the store lib prior to the handling of the exception

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Tue Jul 14 14:32:39 2009
@@ -21,9 +21,9 @@
 #ifndef _MessageStoreModule_
 #define _MessageStoreModule_
 
-#include "MessageStore.h"
-#include "Queue.h"
-#include "RecoveryManager.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/RecoveryManager.h"
 
 #include <boost/intrusive_ptr.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "NameGenerator.h"
+#include "qpid/broker/NameGenerator.h"
 #include <sstream>
 
 using namespace qpid::broker;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "NullMessageStore.h"
-#include "MessageStoreModule.h"
-#include "RecoveryManager.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/MessageStoreModule.h"
+#include "qpid/broker/RecoveryManager.h"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/reply_exceptions.h"
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Tue Jul 14 14:32:39 2009
@@ -22,9 +22,9 @@
 #define _NullMessageStore_
 
 #include <set>
-#include "BrokerImportExport.h"
-#include "MessageStore.h"
-#include "Queue.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/Queue.h"
 
 #include <boost/intrusive_ptr.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableConfig.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableConfig.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableConfig.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableConfig.h Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
  */
 
 #include <string>
-#include "Persistable.h"
+#include "qpid/broker/Persistable.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableExchange.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableExchange.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableExchange.h Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
  */
 
 #include <string>
-#include "Persistable.h"
+#include "qpid/broker/Persistable.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.cpp Tue Jul 14 14:32:39 2009
@@ -20,8 +20,8 @@
  */
 
 
-#include "PersistableMessage.h"
-#include "MessageStore.h"
+#include "qpid/broker/PersistableMessage.h"
+#include "qpid/broker/MessageStore.h"
 #include <iostream>
 
 using namespace qpid::broker;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h Tue Jul 14 14:32:39 2009
@@ -26,11 +26,11 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include "BrokerImportExport.h"
-#include "Persistable.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/Persistable.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/sys/Mutex.h"
-#include "PersistableQueue.h"
+#include "qpid/broker/PersistableQueue.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
  */
 
 #include <string>
-#include "Persistable.h"
+#include "qpid/broker/Persistable.h"
 #include "qpid/management/Manageable.h"
 #include <boost/shared_ptr.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Tue Jul 14 14:32:39 2009
@@ -19,14 +19,14 @@
  *
  */
 
-#include "Broker.h"
-#include "Queue.h"
-#include "QueueEvents.h"
-#include "Exchange.h"
-#include "DeliverableMessage.h"
-#include "MessageStore.h"
-#include "NullMessageStore.h"
-#include "QueueRegistry.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/QueueEvents.h"
+#include "qpid/broker/Exchange.h"
+#include "qpid/broker/DeliverableMessage.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/QueueRegistry.h"
 
 #include "qpid/StringUtils.h"
 #include "qpid/log/Statement.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Tue Jul 14 14:32:39 2009
@@ -22,15 +22,15 @@
  *
  */
 
-#include "BrokerImportExport.h"
-#include "OwnershipToken.h"
-#include "Consumer.h"
-#include "Message.h"
-#include "PersistableQueue.h"
-#include "QueuePolicy.h"
-#include "QueueBindings.h"
-#include "QueueListeners.h"
-#include "RateTracker.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/OwnershipToken.h"
+#include "qpid/broker/Consumer.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/PersistableQueue.h"
+#include "qpid/broker/QueuePolicy.h"
+#include "qpid/broker/QueueBindings.h"
+#include "qpid/broker/QueueListeners.h"
+#include "qpid/broker/RateTracker.h"
 
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueBindings.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueBindings.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueBindings.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueBindings.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "QueueBindings.h"
-#include "ExchangeRegistry.h"
+#include "qpid/broker/QueueBindings.h"
+#include "qpid/broker/ExchangeRegistry.h"
 #include "qpid/framing/reply_exceptions.h"
 
 using qpid::framing::FieldTable;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.cpp Tue Jul 14 14:32:39 2009
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "QueueCleaner.h"
+#include "qpid/broker/QueueCleaner.h"
 
-#include "Broker.h"
+#include "qpid/broker/Broker.h"
 #include <boost/bind.hpp>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueCleaner.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
  *
  */
 
-#include "BrokerImportExport.h"
-#include "Timer.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/Timer.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "QueueEvents.h"
+#include "qpid/broker/QueueEvents.h"
 #include "qpid/Exception.h"
 #include "qpid/log/Statement.h"
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueEvents.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
  *
  */
 
-#include "BrokerImportExport.h"
-#include "QueuedMessage.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/QueuedMessage.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/PollableQueue.h"
 #include <map>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "QueueListeners.h"
+#include "qpid/broker/QueueListeners.h"
 #include <boost/bind.hpp>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueListeners.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "Consumer.h"
+#include "qpid/broker/Consumer.h"
 #include <vector>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "QueuePolicy.h"
-#include "Queue.h"
+#include "qpid/broker/QueuePolicy.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/framing/reply_exceptions.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h Tue Jul 14 14:32:39 2009
@@ -24,8 +24,8 @@
 #include <deque>
 #include <iostream>
 #include <memory>
-#include "BrokerImportExport.h"
-#include "QueuedMessage.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/QueuedMessage.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/AtomicValue.h"
 #include "qpid/sys/Mutex.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "QueueRegistry.h"
-#include "QueueEvents.h"
+#include "qpid/broker/QueueRegistry.h"
+#include "qpid/broker/QueueEvents.h"
 #include "qpid/log/Statement.h"
 #include <sstream>
 #include <assert.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h Tue Jul 14 14:32:39 2009
@@ -21,8 +21,8 @@
 #ifndef _QueueRegistry_
 #define _QueueRegistry_
 
-#include "BrokerImportExport.h"
-#include "Queue.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/management/Manageable.h"
 #include <boost/bind.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef _QueuedMessage_
 #define _QueuedMessage_
 
-#include "Message.h"
+#include "qpid/broker/Message.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RateTracker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RateTracker.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RateTracker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RateTracker.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RateTracker.h"
+#include "qpid/broker/RateTracker.h"
 
 using qpid::sys::AbsTime;
 using qpid::sys::Duration;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableQueue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableQueue.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableQueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableQueue.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
  *
  */
 
-#include "RecoverableMessage.h"
+#include "qpid/broker/RecoverableMessage.h"
 #include <boost/shared_ptr.hpp>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableTransaction.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableTransaction.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableTransaction.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableTransaction.h Tue Jul 14 14:32:39 2009
@@ -24,8 +24,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "RecoverableMessage.h"
-#include "RecoverableQueue.h"
+#include "qpid/broker/RecoverableMessage.h"
+#include "qpid/broker/RecoverableQueue.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RecoveredDequeue.h"
+#include "qpid/broker/RecoveredDequeue.h"
 
 using boost::intrusive_ptr;
 using namespace qpid::broker;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.h Tue Jul 14 14:32:39 2009
@@ -21,11 +21,11 @@
 #ifndef _RecoveredDequeue_
 #define _RecoveredDequeue_
 
-#include "Deliverable.h"
-#include "Message.h"
-#include "MessageStore.h"
-#include "Queue.h"
-#include "TxOp.h"
+#include "qpid/broker/Deliverable.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/TxOp.h"
 
 #include <boost/intrusive_ptr.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RecoveredEnqueue.h"
+#include "qpid/broker/RecoveredEnqueue.h"
 
 using boost::intrusive_ptr;
 using namespace qpid::broker;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h Tue Jul 14 14:32:39 2009
@@ -21,11 +21,11 @@
 #ifndef _RecoveredEnqueue_
 #define _RecoveredEnqueue_
 
-#include "Deliverable.h"
-#include "Message.h"
-#include "MessageStore.h"
-#include "Queue.h"
-#include "TxOp.h"
+#include "qpid/broker/Deliverable.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/TxOp.h"
 
 #include <boost/intrusive_ptr.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h Tue Jul 14 14:32:39 2009
@@ -21,12 +21,12 @@
 #ifndef _RecoveryManager_
 #define _RecoveryManager_
 
-#include "RecoverableExchange.h"
-#include "RecoverableQueue.h"
-#include "RecoverableMessage.h"
-#include "RecoverableTransaction.h"
-#include "RecoverableConfig.h"
-#include "TransactionalStore.h"
+#include "qpid/broker/RecoverableExchange.h"
+#include "qpid/broker/RecoverableQueue.h"
+#include "qpid/broker/RecoverableMessage.h"
+#include "qpid/broker/RecoverableTransaction.h"
+#include "qpid/broker/RecoverableConfig.h"
+#include "qpid/broker/TransactionalStore.h"
 #include "qpid/framing/Buffer.h"
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Tue Jul 14 14:32:39 2009
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include "RecoveryManagerImpl.h"
+#include "qpid/broker/RecoveryManagerImpl.h"
 
-#include "Message.h"
-#include "Queue.h"
-#include "Link.h"
-#include "Bridge.h"
-#include "RecoveredEnqueue.h"
-#include "RecoveredDequeue.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/Link.h"
+#include "qpid/broker/Bridge.h"
+#include "qpid/broker/RecoveredEnqueue.h"
+#include "qpid/broker/RecoveredDequeue.h"
 #include "qpid/framing/reply_exceptions.h"
 
 using boost::dynamic_pointer_cast;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h Tue Jul 14 14:32:39 2009
@@ -22,11 +22,11 @@
 #define _RecoveryManagerImpl_
 
 #include <list>
-#include "DtxManager.h"
-#include "ExchangeRegistry.h"
-#include "QueueRegistry.h"
-#include "LinkRegistry.h"
-#include "RecoveryManager.h"
+#include "qpid/broker/DtxManager.h"
+#include "qpid/broker/ExchangeRegistry.h"
+#include "qpid/broker/QueueRegistry.h"
+#include "qpid/broker/LinkRegistry.h"
+#include "qpid/broker/RecoveryManager.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RetryList.h"
+#include "qpid/broker/RetryList.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RetryList.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
  *
  */
 
-#include "BrokerImportExport.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/Address.h"
 #include "qpid/Url.h"
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
 #  include "config.h"
 #endif
 
-#include "Connection.h"
+#include "qpid/broker/Connection.h"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/reply_exceptions.h"
 #include <boost/format.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnection.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnection.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "SecureConnection.h"
+#include "qpid/broker/SecureConnection.h"
 #include "qpid/sys/SecurityLayer.h"
 #include "qpid/framing/reply_exceptions.h"
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "SecureConnectionFactory.h"
+#include "qpid/broker/SecureConnectionFactory.h"
 #include "qpid/framing/ProtocolVersion.h"
 #include "qpid/amqp_0_10/Connection.h"
 #include "qpid/broker/Connection.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Tue Jul 14 14:32:39 2009
@@ -19,21 +19,21 @@
  *
  */
 
-#include "SessionState.h"
-#include "Connection.h"
-#include "DeliverableMessage.h"
-#include "DtxAck.h"
-#include "DtxTimeout.h"
-#include "Message.h"
-#include "Queue.h"
-#include "SessionContext.h"
-#include "TxAccept.h"
-#include "TxPublish.h"
+#include "qpid/broker/SessionState.h"
+#include "qpid/broker/Connection.h"
+#include "qpid/broker/DeliverableMessage.h"
+#include "qpid/broker/DtxAck.h"
+#include "qpid/broker/DtxTimeout.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/SessionContext.h"
+#include "qpid/broker/TxAccept.h"
+#include "qpid/broker/TxPublish.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/log/Statement.h"
 #include "qpid/ptr_map.h"
-#include "AclModule.h"
+#include "qpid/broker/AclModule.h"
 
 #include <boost/bind.hpp>
 #include <boost/format.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h Tue Jul 14 14:32:39 2009
@@ -22,14 +22,14 @@
  *
  */
 
-#include "Consumer.h"
-#include "Deliverable.h"
-#include "DeliveryAdapter.h"
-#include "DeliveryRecord.h"
-#include "DtxBuffer.h"
-#include "DtxManager.h"
-#include "NameGenerator.h"
-#include "TxBuffer.h"
+#include "qpid/broker/Consumer.h"
+#include "qpid/broker/Deliverable.h"
+#include "qpid/broker/DeliveryAdapter.h"
+#include "qpid/broker/DeliveryRecord.h"
+#include "qpid/broker/DtxBuffer.h"
+#include "qpid/broker/DtxManager.h"
+#include "qpid/broker/NameGenerator.h"
+#include "qpid/broker/TxBuffer.h"
 
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/SequenceSet.h"
@@ -37,7 +37,7 @@
 #include "qpid/sys/AggregateOutput.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/AtomicValue.h"
-#include "AclModule.h"
+#include "qpid/broker/AclModule.h"
 
 #include <list>
 #include <map>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp Tue Jul 14 14:32:39 2009
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "SessionAdapter.h"
-#include "Connection.h"
-#include "Queue.h"
+#include "qpid/broker/SessionAdapter.h"
+#include "qpid/broker/Connection.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/framing/enum.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h Tue Jul 14 14:32:39 2009
@@ -19,10 +19,10 @@
  *
  */
 
-#include "HandlerImpl.h"
+#include "qpid/broker/HandlerImpl.h"
 
-#include "ConnectionToken.h"
-#include "OwnershipToken.h"
+#include "qpid/broker/ConnectionToken.h"
+#include "qpid/broker/OwnershipToken.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/AMQP_ServerOperations.h"
 #include "qpid/framing/reply_exceptions.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h Tue Jul 14 14:32:39 2009
@@ -26,8 +26,8 @@
 #include "qpid/framing/AMQP_ClientProxy.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/sys/OutputControl.h"
-#include "ConnectionState.h"
-#include "OwnershipToken.h"
+#include "qpid/broker/ConnectionState.h"
+#include "qpid/broker/OwnershipToken.h"
 
 
 #include <boost/noncopyable.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandler.cpp Tue Jul 14 14:32:39 2009
@@ -18,9 +18,9 @@
  *
  */
 
-#include "SessionHandler.h"
-#include "SessionState.h"
-#include "Connection.h"
+#include "qpid/broker/SessionHandler.h"
+#include "qpid/broker/SessionState.h"
+#include "qpid/broker/Connection.h"
 #include "qpid/log/Statement.h"
 
 #include <boost/bind.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionManager.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "SessionManager.h"
-#include "SessionState.h"
+#include "qpid/broker/SessionManager.h"
+#include "qpid/broker/SessionState.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/log/Statement.h"
 #include "qpid/log/Helpers.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Tue Jul 14 14:32:39 2009
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include "SessionState.h"
-#include "Broker.h"
-#include "ConnectionState.h"
-#include "DeliveryRecord.h"
-#include "SessionManager.h"
-#include "SessionHandler.h"
-#include "RateFlowcontrol.h"
-#include "Timer.h"
+#include "qpid/broker/SessionState.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/ConnectionState.h"
+#include "qpid/broker/DeliveryRecord.h"
+#include "qpid/broker/SessionManager.h"
+#include "qpid/broker/SessionHandler.h"
+#include "qpid/broker/RateFlowcontrol.h"
+#include "qpid/broker/Timer.h"
 #include "qpid/framing/AMQContentBody.h"
 #include "qpid/framing/AMQHeaderBody.h"
 #include "qpid/framing/AMQMethodBody.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h Tue Jul 14 14:32:39 2009
@@ -28,12 +28,12 @@
 #include "qpid/sys/Time.h"
 #include "qpid/management/Manageable.h"
 #include "qmf/org/apache/qpid/broker/Session.h"
-#include "SessionAdapter.h"
-#include "DeliveryAdapter.h"
-#include "IncompleteMessageList.h"
-#include "MessageBuilder.h"
-#include "SessionContext.h"
-#include "SemanticState.h"
+#include "qpid/broker/SessionAdapter.h"
+#include "qpid/broker/DeliveryAdapter.h"
+#include "qpid/broker/IncompleteMessageList.h"
+#include "qpid/broker/MessageBuilder.h"
+#include "qpid/broker/SessionContext.h"
+#include "qpid/broker/SemanticState.h"
 
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SignalHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SignalHandler.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SignalHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SignalHandler.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "SignalHandler.h"
-#include "Broker.h"
+#include "qpid/broker/SignalHandler.h"
+#include "qpid/broker/Broker.h"
 #include <signal.h>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/System.cpp Tue Jul 14 14:32:39 2009
@@ -17,8 +17,8 @@
 // under the License.
 //
 
-#include "System.h"
-#include "Broker.h"
+#include "qpid/broker/System.h"
+#include "qpid/broker/Broker.h"
 #include "qpid/management/ManagementAgent.h"
 #include "qpid/framing/Uuid.h"
 #include "qpid/sys/SystemInfo.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Timer.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Timer.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Timer.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Timer.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "Timer.h"
+#include "qpid/broker/Timer.h"
 #include <iostream>
 
 using boost::intrusive_ptr;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Timer.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Timer.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Timer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Timer.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef _Timer_
 #define _Timer_
 
-#include "BrokerImportExport.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Runnable.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "TopicExchange.h"
+#include "qpid/broker/TopicExchange.h"
 #include <algorithm>
 
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Tue Jul 14 14:32:39 2009
@@ -23,11 +23,11 @@
 
 #include <map>
 #include <vector>
-#include "BrokerImportExport.h"
-#include "Exchange.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "Queue.h"
+#include "qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "TxAccept.h"
+#include "qpid/broker/TxAccept.h"
 #include "qpid/log/Statement.h"
 
 using std::bind1st;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h Tue Jul 14 14:32:39 2009
@@ -25,8 +25,8 @@
 #include <functional>
 #include <list>
 #include "qpid/framing/SequenceSet.h"
-#include "DeliveryRecord.h"
-#include "TxOp.h"
+#include "qpid/broker/DeliveryRecord.h"
+#include "qpid/broker/TxOp.h"
 
 namespace qpid {
     namespace broker {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "TxBuffer.h"
+#include "qpid/broker/TxBuffer.h"
 #include "qpid/log/Statement.h"
 
 #include <boost/mem_fn.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h Tue Jul 14 14:32:39 2009
@@ -24,9 +24,9 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
-#include "BrokerImportExport.h"
-#include "TransactionalStore.h"
-#include "TxOp.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/TransactionalStore.h"
+#include "qpid/broker/TxOp.h"
 
 /**
  * Represents a single transaction. As such, an instance of this class

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h Tue Jul 14 14:32:39 2009
@@ -21,8 +21,8 @@
 #ifndef _TxOp_
 #define _TxOp_
 
-#include "TxOpVisitor.h"
-#include "TransactionalStore.h"
+#include "qpid/broker/TxOpVisitor.h"
+#include "qpid/broker/TransactionalStore.h"
 #include <boost/shared_ptr.hpp>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 #include "qpid/log/Statement.h"
-#include "TxPublish.h"
+#include "qpid/broker/TxPublish.h"
 
 using boost::intrusive_ptr;
 using namespace qpid::broker;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h Tue Jul 14 14:32:39 2009
@@ -21,12 +21,12 @@
 #ifndef _TxPublish_
 #define _TxPublish_
 
-#include "BrokerImportExport.h"
-#include "Queue.h"
-#include "Deliverable.h"
-#include "Message.h"
-#include "MessageStore.h"
-#include "TxOp.h"
+#include "qpid/broker/BrokerImportExport.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/Deliverable.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/MessageStore.h"
+#include "qpid/broker/TxOp.h"
 
 #include <algorithm>
 #include <functional>

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Vhost.cpp Tue Jul 14 14:32:39 2009
@@ -17,8 +17,8 @@
 // under the License.
 //
 
-#include "Vhost.h"
-#include "Broker.h"
+#include "qpid/broker/Vhost.h"
+#include "qpid/broker/Broker.h"
 #include "qpid/management/ManagementAgent.h"
 
 using namespace qpid::broker;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Bounds.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Bounds.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Bounds.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Bounds.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "Bounds.h"
+#include "qpid/client/Bounds.h"
 
 #include "qpid/log/Statement.h"
 #include "qpid/sys/Waitable.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Completion.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Completion.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Completion.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Completion.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "Completion.h"
-#include "CompletionImpl.h"
-#include "PrivateImplRef.h"
+#include "qpid/client/Completion.h"
+#include "qpid/client/CompletionImpl.h"
+#include "qpid/client/PrivateImplRef.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Completion.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Completion.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Completion.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Completion.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
  *
  */
 
-#include "Handle.h"
-#include "ClientImportExport.h"
+#include "qpid/client/Handle.h"
+#include "qpid/client/ClientImportExport.h"
 #include <string>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/CompletionImpl.h Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
  */
 
 #include "qpid/RefCounted.h"
-#include "Future.h"
+#include "qpid/client/Future.h"
 #include <boost/shared_ptr.hpp>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Tue Jul 14 14:32:39 2009
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include "Connection.h"
-#include "ConnectionImpl.h"
-#include "ConnectionSettings.h"
-#include "Message.h"
-#include "SessionImpl.h"
-#include "SessionBase_0_10Access.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/SessionImpl.h"
+#include "qpid/client/SessionBase_0_10Access.h"
 #include "qpid/Url.h"
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "ConnectionHandler.h"
+#include "qpid/client/ConnectionHandler.h"
 
-#include "SaslFactory.h"
+#include "qpid/client/SaslFactory.h"
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/all_method_bodies.h"
 #include "qpid/framing/ClientInvoker.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionHandler.h Tue Jul 14 14:32:39 2009
@@ -21,10 +21,10 @@
 #ifndef _ConnectionHandler_
 #define _ConnectionHandler_
 
-#include "ChainableFrameHandler.h"
-#include "ConnectionSettings.h"
-#include "Sasl.h"
-#include "StateManager.h"
+#include "qpid/client/ChainableFrameHandler.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/client/Sasl.h"
+#include "qpid/client/StateManager.h"
 #include "qpid/framing/AMQMethodBody.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
 #include "qpid/framing/AMQP_ClientOperations.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp Tue Jul 14 14:32:39 2009
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "ConnectionImpl.h"
-#include "Connector.h"
-#include "ConnectionSettings.h"
-#include "SessionImpl.h"
-#include "FailoverListener.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/Connector.h"
+#include "qpid/client/ConnectionSettings.h"
+#include "qpid/client/SessionImpl.h"
+#include "qpid/client/FailoverListener.h"
 
 #include "qpid/log/Statement.h"
 #include "qpid/Url.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
 #ifndef _ConnectionImpl_
 #define _ConnectionImpl_
 
-#include "Bounds.h"
-#include "ConnectionHandler.h"
+#include "qpid/client/Bounds.h"
+#include "qpid/client/ConnectionHandler.h"
 
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/Mutex.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ConnectionSettings.h"
+#include "qpid/client/ConnectionSettings.h"
 
 #include "qpid/log/Logger.h"
 #include "qpid/sys/Socket.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp Tue Jul 14 14:32:39 2009
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "Connector.h"
+#include "qpid/client/Connector.h"
 
-#include "Bounds.h"
-#include "ConnectionImpl.h"
-#include "ConnectionSettings.h"
+#include "qpid/client/Bounds.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
 #include "qpid/log/Statement.h"
 #include "qpid/sys/Codec.h"
 #include "qpid/sys/Time.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Demux.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Demux.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Demux.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Demux.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "Demux.h"
+#include "qpid/client/Demux.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/MessageTransferBody.h"
 

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp Tue Jul 14 14:32:39 2009
@@ -18,16 +18,16 @@
  * under the License.
  *
  */
-#include "Dispatcher.h"
-#include "SubscriptionImpl.h"
-#include "SessionImpl.h"
+#include "qpid/client/Dispatcher.h"
+#include "qpid/client/SubscriptionImpl.h"
+#include "qpid/client/SessionImpl.h"
 
 #include "qpid/framing/FrameSet.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/log/Statement.h"
 #include "qpid/sys/BlockingQueue.h"
-#include "Message.h"
-#include "MessageImpl.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageImpl.h"
 
 #include <boost/state_saver.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h Tue Jul 14 14:32:39 2009
@@ -30,9 +30,9 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Runnable.h"
 #include "qpid/sys/Thread.h"
-#include "ClientImportExport.h"
-#include "MessageListener.h"
-#include "SubscriptionImpl.h"
+#include "qpid/client/ClientImportExport.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/SubscriptionImpl.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Execution.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Execution.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Execution.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Execution.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
 #define _Execution_
 
 #include "qpid/framing/SequenceNumber.h"
-#include "Demux.h"
+#include "qpid/client/Demux.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "FailoverListener.h"
-#include "SessionBase_0_10Access.h"
+#include "qpid/client/FailoverListener.h"
+#include "qpid/client/SessionBase_0_10Access.h"
 #include "qpid/client/SessionImpl.h"
 #include "qpid/client/ConnectionImpl.h"
 #include "qpid/client/SubscriptionImpl.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "FailoverManager.h"
+#include "qpid/client/FailoverManager.h"
 #include "qpid/Exception.h"
 #include "qpid/log/Statement.h"
 #include "qpid/sys/Time.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FailoverManager.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
  *
  */
 
-#include "Connection.h"
-#include "ConnectionSettings.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ConnectionSettings.h"
 #include "qpid/Exception.h"
 #include "qpid/client/AsyncSession.h"
 #include "qpid/sys/Monitor.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "Future.h"
-#include "SessionImpl.h"
+#include "qpid/client/Future.h"
+#include "qpid/client/SessionImpl.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Future.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Future.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Future.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Future.h Tue Jul 14 14:32:39 2009
@@ -26,9 +26,9 @@
 #include <boost/shared_ptr.hpp>
 #include "qpid/Exception.h"
 #include "qpid/framing/SequenceNumber.h"
-#include "FutureCompletion.h"
-#include "FutureResult.h"
-#include "ClientImportExport.h"
+#include "qpid/client/FutureCompletion.h"
+#include "qpid/client/FutureResult.h"
+#include "qpid/client/ClientImportExport.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/FutureCompletion.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FutureCompletion.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FutureCompletion.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FutureCompletion.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "FutureCompletion.h"
+#include "qpid/client/FutureCompletion.h"
 
 using namespace qpid::client;
 using namespace qpid::sys;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "FutureResult.h"
+#include "qpid/client/FutureResult.h"
 
-#include "SessionImpl.h"
+#include "qpid/client/SessionImpl.h"
 
 using namespace qpid::client;
 using namespace qpid::framing;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FutureResult.h Tue Jul 14 14:32:39 2009
@@ -24,9 +24,9 @@
 
 #include <string>
 
-#include "ClientImportExport.h"
+#include "qpid/client/ClientImportExport.h"
 #include "qpid/framing/amqp_framing.h"
-#include "FutureCompletion.h"
+#include "qpid/client/FutureCompletion.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp Tue Jul 14 14:32:39 2009
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-#include "LocalQueue.h"
-#include "LocalQueueImpl.h"
-#include "MessageImpl.h"
+#include "qpid/client/LocalQueue.h"
+#include "qpid/client/LocalQueueImpl.h"
+#include "qpid/client/MessageImpl.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/FrameSet.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/reply_exceptions.h"
-#include "PrivateImplRef.h"
-#include "SubscriptionImpl.h"
+#include "qpid/client/PrivateImplRef.h"
+#include "qpid/client/SubscriptionImpl.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.h Tue Jul 14 14:32:39 2009
@@ -22,9 +22,9 @@
  *
  */
 
-#include "ClientImportExport.h"
-#include "Handle.h"
-#include "Message.h"
+#include "qpid/client/ClientImportExport.h"
+#include "qpid/client/Handle.h"
+#include "qpid/client/Message.h"
 #include "qpid/sys/Time.h"
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp Tue Jul 14 14:32:39 2009
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-#include "LocalQueueImpl.h"
-#include "MessageImpl.h"
+#include "qpid/client/LocalQueueImpl.h"
+#include "qpid/client/MessageImpl.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/FrameSet.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/reply_exceptions.h"
-#include "PrivateImplRef.h"
-#include "SubscriptionImpl.h"
-#include "CompletionImpl.h"
+#include "qpid/client/PrivateImplRef.h"
+#include "qpid/client/SubscriptionImpl.h"
+#include "qpid/client/CompletionImpl.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/LocalQueueImpl.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
  *
  */
 
-#include "ClientImportExport.h"
-#include "Handle.h"
+#include "qpid/client/ClientImportExport.h"
+#include "qpid/client/Handle.h"
 #include "qpid/client/Message.h"
 #include "qpid/client/Subscription.h"
 #include "qpid/client/Demux.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "Message.h"
-#include "MessageImpl.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageImpl.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "MessageImpl.h"
+#include "qpid/client/MessageImpl.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/MessageImpl.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "Message.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Session.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/TransferContent.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp Tue Jul 14 14:32:39 2009
@@ -19,6 +19,6 @@
  *
  */
 
-#include "MessageListener.h"
+#include "qpid/client/MessageListener.h"
 
 qpid::client::MessageListener::~MessageListener() {}

Modified: qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h Tue Jul 14 14:32:39 2009
@@ -24,7 +24,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "MessageReplayTracker.h"
+#include "qpid/client/MessageReplayTracker.h"
 #include <boost/bind.hpp>
 
 namespace qpid {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/MessageReplayTracker.h Tue Jul 14 14:32:39 2009
@@ -21,8 +21,8 @@
  * under the License.
  *
  */
-#include "AsyncSession.h"
-#include "Message.h"
+#include "qpid/client/AsyncSession.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/ClientImportExport.h"
 #include <list>
 #include <string>

Modified: qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "QueueOptions.h"
+#include "qpid/client/QueueOptions.h"
 
 namespace qpid {
 namespace client {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/QueueOptions.h Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ClientImportExport.h"
+#include "qpid/client/ClientImportExport.h"
 #include "qpid/framing/FieldTable.h"
 
 #ifndef _QueueOptions_

Modified: qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp Tue Jul 14 14:32:39 2009
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "Connector.h"
+#include "qpid/client/Connector.h"
 
-#include "Bounds.h"
-#include "ConnectionImpl.h"
-#include "ConnectionSettings.h"
+#include "qpid/client/Bounds.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
 #include "qpid/log/Statement.h"
 #include "qpid/sys/Time.h"
 #include "qpid/framing/AMQFrame.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Results.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Results.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Results.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Results.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "Results.h"
-#include "FutureResult.h"
+#include "qpid/client/Results.h"
+#include "qpid/client/FutureResult.h"
 #include "qpid/framing/SequenceSet.h"
 
 using namespace qpid::framing;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "SaslFactory.h"
-#include "ConnectionSettings.h"
+#include "qpid/client/SaslFactory.h"
+#include "qpid/client/ConnectionSettings.h"
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SaslFactory.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "Sasl.h"
+#include "qpid/client/Sasl.h"
 #include "qpid/sys/Mutex.h"
 #include <memory>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp Tue Jul 14 14:32:39 2009
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "SessionBase_0_10.h"
-#include "Connection.h"
+#include "qpid/client/SessionBase_0_10.h"
+#include "qpid/client/Connection.h"
 #include "qpid/client/SessionImpl.h"
 #include "qpid/client/Future.h"
 #include "qpid/framing/all_method_bodies.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.cpp Tue Jul 14 14:32:39 2009
@@ -19,10 +19,10 @@
  *
  */
 
-#include "SessionImpl.h"
+#include "qpid/client/SessionImpl.h"
 
-#include "ConnectionImpl.h"
-#include "Future.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/Future.h"
 
 #include "qpid/framing/all_method_bodies.h"
 #include "qpid/framing/ClientInvoker.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h Tue Jul 14 14:32:39 2009
@@ -22,9 +22,9 @@
 #ifndef _SessionImpl_
 #define _SessionImpl_
 
-#include "Demux.h"
-#include "Execution.h"
-#include "Results.h"
+#include "qpid/client/Demux.h"
+#include "qpid/client/Execution.h"
+#include "qpid/client/Results.h"
 
 #include "qpid/SessionId.h"
 #include "qpid/SessionState.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp Tue Jul 14 14:32:39 2009
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include "Connector.h"
+#include "qpid/client/Connector.h"
 
 #include "config.h"
-#include "Bounds.h"
-#include "ConnectionImpl.h"
-#include "ConnectionSettings.h"
+#include "qpid/client/Bounds.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/ConnectionSettings.h"
 #include "qpid/Options.h"
 #include "qpid/log/Statement.h"
 #include "qpid/sys/Time.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/client/StateManager.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/StateManager.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/StateManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/StateManager.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "StateManager.h"
+#include "qpid/client/StateManager.h"
 #include "qpid/framing/amqp_framing.h"
 
 using namespace qpid::client;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Subscription.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Subscription.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Subscription.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Subscription.cpp Tue Jul 14 14:32:39 2009
@@ -19,10 +19,10 @@
  *
  */
 
-#include "Subscription.h"
-#include "SubscriptionImpl.h"
-#include "CompletionImpl.h"
-#include "PrivateImplRef.h"
+#include "qpid/client/Subscription.h"
+#include "qpid/client/SubscriptionImpl.h"
+#include "qpid/client/CompletionImpl.h"
+#include "qpid/client/PrivateImplRef.h"
 #include "qpid/framing/enum.h"
 
 namespace qpid {



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