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 [4/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/management/ManagementAgent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
  
-#include "ManagementAgent.h"
-#include "ManagementObject.h"
-#include "IdAllocator.h"
+#include "qpid/management/ManagementAgent.h"
+#include "qpid/management/ManagementObject.h"
+#include "qpid/management/IdAllocator.h"
 #include "qpid/broker/DeliverableMessage.h"
 #include "qpid/log/Statement.h"
 #include <qpid/broker/Message.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.h Tue Jul 14 14:32:39 2009
@@ -28,9 +28,9 @@
 #include "qpid/framing/Uuid.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/broker/ConnectionToken.h"
-#include "ManagementObject.h"
-#include "ManagementEvent.h"
-#include "Manageable.h"
+#include "qpid/management/ManagementObject.h"
+#include "qpid/management/ManagementEvent.h"
+#include "qpid/management/Manageable.h"
 #include "qmf/org/apache/qpid/broker/Agent.h"
 #include <qpid/framing/AMQFrame.h>
 #include <memory>

Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementEvent.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
  *
  */
 
-#include "ManagementObject.h"
+#include "qpid/management/ManagementObject.h"
 #include <qpid/framing/Buffer.h>
 #include <string>
 

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
  
-#include "Manageable.h"
-#include "ManagementObject.h"
+#include "qpid/management/Manageable.h"
+#include "qpid/management/ManagementObject.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Thread.h"
 

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h Tue Jul 14 14:32:39 2009
@@ -21,9 +21,9 @@
 #ifndef _AggregateOutput_
 #define _AggregateOutput_
 
-#include "Monitor.h"
-#include "OutputControl.h"
-#include "OutputTask.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/OutputControl.h"
+#include "qpid/sys/OutputTask.h"
 #include "qpid/CommonImportExport.h"
 
 #include <algorithm>

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h Tue Jul 14 14:32:39 2009
@@ -21,10 +21,10 @@
  *
  */
 
-#include "OutputControl.h"
-#include "ConnectionCodec.h"
-#include "AtomicValue.h"
-#include "Mutex.h"
+#include "qpid/sys/OutputControl.h"
+#include "qpid/sys/ConnectionCodec.h"
+#include "qpid/sys/AtomicValue.h"
+#include "qpid/sys/Mutex.h"
 #include "qpid/CommonImportExport.h"
 
 namespace qpid {

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

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
 #define _ConnectionInputHandler_
 
 #include "qpid/framing/InputHandler.h"
-#include "OutputTask.h"
-#include "TimeoutHandler.h"
+#include "qpid/sys/OutputTask.h"
+#include "qpid/sys/TimeoutHandler.h"
 
 namespace qpid {
 namespace sys {

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

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

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

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

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

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/LatencyTracker.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/LatencyTracker.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/LatencyTracker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/LatencyTracker.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
  *
  */
 
-#include "Time.h"
+#include "qpid/sys/Time.h"
 #include <string>
 #include <limits>
 #include <map>

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

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

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h Tue Jul 14 14:32:39 2009
@@ -24,7 +24,7 @@
 
 #include "qpid/sys/IntegerTypes.h"
 #include "qpid/SharedObject.h"
-#include "ConnectionCodec.h"
+#include "qpid/sys/ConnectionCodec.h"
 #include <boost/function.hpp>
 
 namespace qpid {

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

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

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

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
  *
  */
 
-#include "IOHandle.h"
+#include "qpid/sys/IOHandle.h"
 #include "qpid/sys/IntegerTypes.h"
 #include "qpid/CommonImportExport.h"
 #include <string>

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "ProtocolFactory.h"
-#include "AsynchIOHandler.h"
-#include "AsynchIO.h"
+#include "qpid/sys/ProtocolFactory.h"
+#include "qpid/sys/AsynchIOHandler.h"
+#include "qpid/sys/AsynchIO.h"
 
 #include "qpid/Plugin.h"
 #include "qpid/sys/Socket.h"

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRPool.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRPool.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRPool.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRPool.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "APRPool.h"
-#include "APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
 #include <boost/pool/detail/singleton.hpp>
 
 using namespace qpid::sys;

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/apr/Mutex.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Mutex.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/apr/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/apr/Mutex.h Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "APRBase.h"
-#include "APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
 
 #include <boost/noncopyable.hpp>
 #include <apr_thread_mutex.h>

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
 
 #include "qpid/sys/Socket.h"
 
-#include "APRBase.h"
-#include "APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
 
 #include <apr_network_io.h>
 

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.h Tue Jul 14 14:32:39 2009
@@ -22,8 +22,8 @@
  *
  */
 
-#include "APRPool.h"
-#include "APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
 
 #include <apr_thread_proc.h>
 #include <apr_portable.h>

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp Tue Jul 14 14:32:39 2009
@@ -26,7 +26,7 @@
 #include "qpid/sys/Time.h"
 #include "qpid/log/Statement.h"
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 // TODO The basic algorithm here is not really POSIX specific and with a
 // bit more abstraction could (should) be promoted to be platform portable

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp Tue Jul 14 14:32:39 2009
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 namespace qpid {
 namespace sys {

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 #include <pthread.h>
 #include <boost/noncopyable.hpp>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
 //
 
 #include "qpid/sys/PipeHandle.h"
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/socket.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp Tue Jul 14 14:32:39 2009
@@ -21,8 +21,8 @@
 
 #include "qpid/sys/Socket.h"
 
-#include "check.h"
-#include "PrivatePosix.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/sys/posix/PrivatePosix.h"
 
 #include <fcntl.h>
 #include <sys/types.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp Tue Jul 14 14:32:39 2009
@@ -20,7 +20,7 @@
 
 #include "qpid/sys/SystemInfo.h"
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 #include <sys/ioctl.h>
 #include <sys/utsname.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
 #include "qpid/sys/Thread.h"
 
 #include "qpid/sys/Runnable.h"
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 #include <pthread.h>
 

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

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef Rdma_Acceptor_h
 #define Rdma_Acceptor_h
 
-#include "rdma_wrap.h"
+#include "qpid/sys/rdma/rdma_wrap.h"
 
 #include "qpid/sys/AtomicValue.h"
 #include "qpid/sys/Dispatcher.h"

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef RDMA_FACTORIES_H
 #define RDMA_FACTORIES_H
 
-#include "rdma_exception.h"
+#include "qpid/sys/rdma/rdma_exception.h"
 
 #include <rdma/rdma_cma.h>
 

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #ifndef RDMA_WRAP_H
 #define RDMA_WRAP_H
 
-#include "rdma_factories.h"
+#include "qpid/sys/rdma/rdma_factories.h"
 
 #include <rdma/rdma_cma.h>
 

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "SslIo.h"
-#include "SslSocket.h"
+#include "qpid/sys/ssl/SslIo.h"
+#include "qpid/sys/ssl/SslSocket.h"
 
 #include "qpid/sys/Time.h"
 #include "qpid/sys/posix/check.h"

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "SslSocket.h"
-#include "check.h"
-#include "util.h"
+#include "qpid/sys/ssl/SslSocket.h"
+#include "qpid/sys/ssl/check.h"
+#include "qpid/sys/ssl/util.h"
 #include "qpid/Exception.h"
 #include "qpid/sys/posix/check.h"
 #include "qpid/sys/posix/PrivatePosix.h"

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

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "AsynchIoResult.h"
-#include "IoHandlePrivate.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
 #include "qpid/sys/AsynchIO.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Socket.h"
@@ -29,7 +29,7 @@
 #include "qpid/sys/Time.h"
 #include "qpid/log/Statement.h"
 
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <boost/thread/once.hpp>
 

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

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
  *
  */
 
-#include "AsynchIoResult.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
 #include "qpid/CommonImportExport.h"
 
 #include <winsock2.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp Tue Jul 14 14:32:39 2009
@@ -23,9 +23,9 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Dispatcher.h"
 
-#include "AsynchIoResult.h"
-#include "IoHandlePrivate.h"
-#include "check.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
+#include "qpid/sys/windows/check.h"
 
 #include <winsock2.h>
 #include <windows.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/LockFile.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/LockFile.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/LockFile.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/LockFile.cpp Tue Jul 14 14:32:39 2009
@@ -17,7 +17,7 @@
  */
 
 #include "qpid/sys/LockFile.h"
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <windows.h>
 

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <boost/version.hpp>
 #if (BOOST_VERSION < 103500)

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp Tue Jul 14 14:32:39 2009
@@ -18,7 +18,7 @@
 //
 
 #include "qpid/sys/PipeHandle.h"
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 #include <io.h>
 #include <fcntl.h>
 #include <errno.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp Tue Jul 14 14:32:39 2009
@@ -24,8 +24,8 @@
 
 #include "qpid/sys/PollableCondition.h"
 #include "qpid/sys/IOHandle.h"
-#include "AsynchIoResult.h"
-#include "IoHandlePrivate.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
 
 #include <boost/bind.hpp>
 #include <windows.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp Tue Jul 14 14:32:39 2009
@@ -20,8 +20,8 @@
  */
 
 #include "qpid/sys/Socket.h"
-#include "IoHandlePrivate.h"
-#include "check.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
+#include "qpid/sys/windows/check.h"
 #include "qpid/sys/Time.h"
 
 #include <cstdlib>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Runnable.h"
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <process.h>
 #include <windows.h>

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp Tue Jul 14 14:32:39 2009
@@ -24,7 +24,7 @@
 #  undef uuid_t
 #endif
 
-#include "uuid.h"
+#include "qpid/sys/windows/uuid.h"
 
 #include <string.h>
 

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

Modified: qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp Tue Jul 14 14:32:39 2009
@@ -25,7 +25,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/utility/in_place_factory.hpp>
 
-#include "XmlExchange.h"
+#include "qpid/xml/XmlExchange.h"
 
 namespace qpid {
 namespace broker {  // ACL uses the acl namespace here - should I?

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

Modified: qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp Tue Jul 14 14:32:39 2009
@@ -20,7 +20,7 @@
  *
  */
 #include "qpid/framing/AccumulatedAck.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
 #include <list>
 

Modified: qpid/trunk/qpid/cpp/src/tests/Array.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Array.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Array.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Array.cpp Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
 #include "qpid/framing/Array.h"
 #include "qpid/framing/FieldValue.h"
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(ArrayTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/AsyncCompletion.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/AsyncCompletion.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/AsyncCompletion.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/AsyncCompletion.cpp Tue Jul 14 14:32:39 2009
@@ -17,9 +17,9 @@
  */
 
 
-#include "unit_test.h"
-#include "test_tools.h"
-#include "BrokerFixture.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
+#include "tests/BrokerFixture.h"
 #include "qpid/broker/NullMessageStore.h"
 #include "qpid/sys/BlockingQueue.h"
 #include "qpid/client/AsyncSession.h"

Modified: qpid/trunk/qpid/cpp/src/tests/AtomicValue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/AtomicValue.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/AtomicValue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/AtomicValue.cpp Tue Jul 14 14:32:39 2009
@@ -17,8 +17,8 @@
  */
 
 
-#include "unit_test.h"
-#include "test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
 #include "qpid/sys/AtomicValue.h"
 
 QPID_AUTO_TEST_SUITE(AtomicValueTestSuite)

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

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

Modified: qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp Tue Jul 14 14:32:39 2009
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "unit_test.h"
-#include "test_tools.h"
-#include "BrokerFixture.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
+#include "tests/BrokerFixture.h"
 #include "qpid/client/QueueOptions.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/client/SubscriptionManager.h"

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFailover.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFailover.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClusterFailover.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFailover.cpp Tue Jul 14 14:32:39 2009
@@ -24,9 +24,9 @@
  * In this case the failed nodes must shut down.
  */
 
-#include "test_tools.h"
-#include "unit_test.h"
-#include "ClusterFixture.h"
+#include "tests/test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/ClusterFixture.h"
 #include "qpid/client/FailoverManager.h"
 #include <boost/assign.hpp>
 #include <boost/algorithm/string.hpp>

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp Tue Jul 14 14:32:39 2009
@@ -16,10 +16,10 @@
  *
  */
 
-#include "test_tools.h"
-#include "unit_test.h"
-#include "ForkedBroker.h"
-#include "BrokerFixture.h"
+#include "tests/test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/ForkedBroker.h"
+#include "tests/BrokerFixture.h"
 
 #include "qpid/client/Connection.h"
 #include "qpid/client/ConnectionAccess.h"
@@ -59,7 +59,7 @@
 using boost::assign::list_of;
 
 
-#include "ClusterFixture.h"
+#include "tests/ClusterFixture.h"
 
 ClusterFixture::ClusterFixture(size_t n, const Args& args_, int localIndex_)
     : name(Uuid(true).str()), localIndex(localIndex_), userArgs(args_)

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h Tue Jul 14 14:32:39 2009
@@ -19,10 +19,10 @@
  *
  */
 
-#include "test_tools.h"
-#include "unit_test.h"
-#include "ForkedBroker.h"
-#include "BrokerFixture.h"
+#include "tests/test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/ForkedBroker.h"
+#include "tests/BrokerFixture.h"
 
 #include "qpid/client/Connection.h"
 #include "qpid/client/ConnectionAccess.h"

Modified: qpid/trunk/qpid/cpp/src/tests/ConsoleTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ConsoleTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ConsoleTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ConsoleTest.cpp Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 
 #include "qpid/console/Package.h"
 #include "qpid/console/ClassKey.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(ConsoleTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp Tue Jul 14 14:32:39 2009
@@ -20,7 +20,7 @@
  *
  */
 #include "qpid/broker/DeliveryRecord.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
 #include <memory>
 #include <boost/format.hpp>

Modified: qpid/trunk/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/DtxWorkRecordTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/DtxWorkRecordTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/DtxWorkRecordTest.cpp Tue Jul 14 14:32:39 2009
@@ -19,10 +19,10 @@
  *
  */
 #include "qpid/broker/DtxWorkRecord.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
 #include <vector>
-#include "TxMocks.h"
+#include "tests/TxMocks.h"
 
 using namespace qpid::broker;
 using boost::static_pointer_cast;

Modified: qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp Tue Jul 14 14:32:39 2009
@@ -29,9 +29,9 @@
 #include "qpid/broker/HeadersExchange.h"
 #include "qpid/broker/TopicExchange.h"
 #include "qpid/framing/reply_exceptions.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
-#include "MessageUtils.h"
+#include "tests/MessageUtils.h"
 
 using boost::intrusive_ptr;
 using namespace qpid::broker;

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

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

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

Modified: qpid/trunk/qpid/cpp/src/tests/Frame.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Frame.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Frame.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Frame.cpp Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #include "qpid/framing/Frame.h"
 
 #include <boost/lexical_cast.hpp>
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(FrameTestSuite)
 

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

Modified: qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp Tue Jul 14 14:32:39 2009
@@ -25,7 +25,7 @@
 #include "qpid/framing/all_method_bodies.h"
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/reply_exceptions.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>

Modified: qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #include <iostream>
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/FieldValue.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 using namespace qpid::framing;
 using namespace std;

Modified: qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp Tue Jul 14 14:32:39 2009
@@ -23,7 +23,7 @@
 #include "qpid/broker/HeadersExchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/framing/FieldValue.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;

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

Modified: qpid/trunk/qpid/cpp/src/tests/InlineAllocator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/InlineAllocator.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/InlineAllocator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/InlineAllocator.cpp Tue Jul 14 14:32:39 2009
@@ -20,7 +20,7 @@
  */
 
 #include "qpid/InlineAllocator.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(InlineAllocatorTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp Tue Jul 14 14:32:39 2009
@@ -20,7 +20,7 @@
  */
 
 #include "qpid/InlineVector.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(InlineVectorTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/ManagementTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ManagementTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ManagementTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ManagementTest.cpp Tue Jul 14 14:32:39 2009
@@ -22,7 +22,7 @@
 #include "qpid/management/ManagementObject.h"
 #include "qpid/framing/Buffer.h"
 #include "qpid/console/ObjectId.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(ManagementTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp Tue Jul 14 14:32:39 2009
@@ -24,7 +24,7 @@
 #include "qpid/framing/frame_functors.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/TypeFilter.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <list>
 
 using namespace qpid::broker;

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

Modified: qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Tue Jul 14 14:32:39 2009
@@ -26,7 +26,7 @@
 #include "qpid/framing/Uuid.h"
 #include "qpid/sys/alloca.h"
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 #include <iostream>
 

Modified: qpid/trunk/qpid/cpp/src/tests/PartialFailure.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/PartialFailure.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/PartialFailure.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/PartialFailure.cpp Tue Jul 14 14:32:39 2009
@@ -24,9 +24,9 @@
  * In this case the failed nodes must shut down.
  */
 
-#include "test_tools.h"
-#include "unit_test.h"
-#include "ClusterFixture.h"
+#include "tests/test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/ClusterFixture.h"
 #include <boost/assign.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>

Modified: qpid/trunk/qpid/cpp/src/tests/PollableCondition.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/PollableCondition.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/PollableCondition.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/PollableCondition.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "test_tools.h"
-#include "unit_test.h"
+#include "tests/test_tools.h"
+#include "tests/unit_test.h"
 #include "qpid/sys/Poller.h"
 #include "qpid/sys/PollableCondition.h"
 #include "qpid/sys/Monitor.h"

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

Modified: qpid/trunk/qpid/cpp/src/tests/QueueEvents.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueueEvents.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/QueueEvents.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/QueueEvents.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "MessageUtils.h"
-#include "unit_test.h"
-#include "BrokerFixture.h"
+#include "tests/MessageUtils.h"
+#include "tests/unit_test.h"
+#include "tests/BrokerFixture.h"
 #include "qpid/broker/Message.h"
 #include "qpid/broker/Queue.h"
 #include "qpid/broker/QueueEvents.h"

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

Modified: qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp Tue Jul 14 14:32:39 2009
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-#include "unit_test.h"
-#include "test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
 
 #include "qpid/broker/QueuePolicy.h"
 #include "qpid/client/QueueOptions.h"
 #include "qpid/sys/Time.h"
 #include "qpid/framing/reply_exceptions.h"
-#include "MessageUtils.h"
-#include "BrokerFixture.h"
+#include "tests/MessageUtils.h"
+#include "tests/BrokerFixture.h"
 
 using namespace qpid::broker;
 using namespace qpid::client;

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

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

Modified: qpid/trunk/qpid/cpp/src/tests/RangeSet.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/RangeSet.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/RangeSet.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/RangeSet.cpp Tue Jul 14 14:32:39 2009
@@ -17,8 +17,8 @@
  */
 
 
-#include "unit_test.h"
-#include "test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
 #include "qpid/RangeSet.h"
 
 using namespace std;

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

Modified: qpid/trunk/qpid/cpp/src/tests/RefCounted.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/RefCounted.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/RefCounted.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/RefCounted.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
 #include "qpid/RefCounted.h"
 #include <boost/intrusive_ptr.hpp>
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(RefCountedTestSuiteTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/ReplicationTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ReplicationTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ReplicationTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ReplicationTest.cpp Tue Jul 14 14:32:39 2009
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "unit_test.h"
-#include "test_tools.h"
-#include "BrokerFixture.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
+#include "tests/BrokerFixture.h"
 
 #include "qpid/Plugin.h"
 #include "qpid/broker/Broker.h"

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

Modified: qpid/trunk/qpid/cpp/src/tests/SequenceNumberTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/SequenceNumberTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/SequenceNumberTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/SequenceNumberTest.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/framing/SequenceNumberSet.h"

Modified: qpid/trunk/qpid/cpp/src/tests/SequenceSet.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/SequenceSet.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/SequenceSet.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/SequenceSet.cpp Tue Jul 14 14:32:39 2009
@@ -17,7 +17,7 @@
  */
 
 #include "qpid/framing/SequenceSet.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <list>
 
 QPID_AUTO_TEST_SUITE(SequenceSetTestSuite)

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

Modified: qpid/trunk/qpid/cpp/src/tests/Shlib.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Shlib.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Shlib.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Shlib.cpp Tue Jul 14 14:32:39 2009
@@ -18,11 +18,11 @@
  *
  */
 
-#include "test_tools.h"
+#include "tests/test_tools.h"
 #include "qpid/sys/Shlib.h"
 #include "qpid/Exception.h"
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(ShlibTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/StringUtils.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/StringUtils.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/StringUtils.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/StringUtils.cpp Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
 #include <iostream>
 #include "qpid/StringUtils.h"
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 QPID_AUTO_TEST_SUITE(StringUtilsTestSuite)
 

Modified: qpid/trunk/qpid/cpp/src/tests/TestOptions.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TestOptions.h?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TestOptions.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/TestOptions.h Tue Jul 14 14:32:39 2009
@@ -26,7 +26,7 @@
 #include "qpid/Url.h"
 #include "qpid/log/Logger.h"
 #include "qpid/client/Connection.h"
-#include "ConnectionOptions.h"
+#include "tests/ConnectionOptions.h"
 
 #include <iostream>
 #include <exception>

Modified: qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp Tue Jul 14 14:32:39 2009
@@ -21,7 +21,7 @@
  */
 #include "qpid/broker/Timer.h"
 #include "qpid/sys/Monitor.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <math.h>
 #include <iostream>
 #include <memory>

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

Modified: qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp Tue Jul 14 14:32:39 2009
@@ -19,10 +19,10 @@
  *
  */
 #include "qpid/broker/TxBuffer.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
 #include <vector>
-#include "TxMocks.h"
+#include "tests/TxMocks.h"
 
 using namespace qpid::broker;
 using boost::static_pointer_cast;

Modified: qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp Tue Jul 14 14:32:39 2009
@@ -21,12 +21,12 @@
 #include "qpid/broker/NullMessageStore.h"
 #include "qpid/broker/RecoveryManager.h"
 #include "qpid/broker/TxPublish.h"
-#include "unit_test.h"
+#include "tests/unit_test.h"
 #include <iostream>
 #include <list>
 #include <vector>
-#include "MessageUtils.h"
-#include "TestMessageStore.h"
+#include "tests/MessageUtils.h"
+#include "tests/TestMessageStore.h"
 
 using std::list;
 using std::pair;

Modified: qpid/trunk/qpid/cpp/src/tests/Url.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Url.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Url.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Url.cpp Tue Jul 14 14:32:39 2009
@@ -17,8 +17,8 @@
  */
 
 
-#include "unit_test.h"
-#include "test_tools.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
 #include "qpid/Url.h"
 #include <boost/assign.hpp>
 

Modified: qpid/trunk/qpid/cpp/src/tests/Uuid.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Uuid.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Uuid.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/Uuid.cpp Tue Jul 14 14:32:39 2009
@@ -20,7 +20,7 @@
 #include "qpid/framing/Buffer.h"
 #include "qpid/sys/alloca.h"
 
-#include "unit_test.h"
+#include "tests/unit_test.h"
 
 #include <set>
 

Modified: qpid/trunk/qpid/cpp/src/tests/XmlClientSessionTest.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/XmlClientSessionTest.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/XmlClientSessionTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/XmlClientSessionTest.cpp Tue Jul 14 14:32:39 2009
@@ -19,9 +19,9 @@
  *
  */
 
-#include "unit_test.h"
-#include "test_tools.h"
-#include "BrokerFixture.h"
+#include "tests/unit_test.h"
+#include "tests/test_tools.h"
+#include "tests/BrokerFixture.h"
 #include "qpid/sys/Shlib.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Thread.h"

Modified: qpid/trunk/qpid/cpp/src/tests/ais_test.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ais_test.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ais_test.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ais_test.cpp Tue Jul 14 14:32:39 2009
@@ -19,5 +19,5 @@
 // Defines test_main function to link with actual unit test code.
 #define BOOST_AUTO_TEST_MAIN	// Boost 1.33
 #define BOOST_TEST_MAIN
-#include "unit_test.h"
+#include "tests/unit_test.h"
 

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

Modified: qpid/trunk/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp Tue Jul 14 14:32:39 2009
@@ -19,7 +19,7 @@
  *
  */
 
-#include "unit_test.h"
+#include "tests/amqp_0_10/unit_test.h"
 #include "qpid/amqp_0_10/ProxyTemplate.h"
 #include <boost/any.hpp>
 

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

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

Modified: qpid/trunk/qpid/cpp/src/tests/amqp_0_10/serialize.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/serialize.cpp?rev=793909&r1=793908&r2=793909&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/amqp_0_10/serialize.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/amqp_0_10/serialize.cpp Tue Jul 14 14:32:39 2009
@@ -19,8 +19,8 @@
  *
  */
 
-#include "unit_test.h"
-#include "allSegmentTypes.h"
+#include "tests/amqp_0_10/unit_test.h"
+#include "tests/amqp_0_10/allSegmentTypes.h"
 
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/framing/Buffer.h"



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