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 2007/04/13 22:58:34 UTC

svn commit: r528668 [2/2] - in /incubator/qpid/trunk/qpid/cpp: ./ gentools/templ.cpp/ src/ src/broker/ src/client/ src/framing/ src/qpid/ src/qpid/broker/ src/qpid/client/ src/qpid/framing/ src/qpid/sys/ src/qpid/sys/apr/ src/qpid/sys/posix/ src/sys/ s...

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.h Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <boost/noncopyable.hpp>
-#include "../Exception.h"
+#include "qpid/Exception.h"
 #include "Monitor.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ThreadSafeQueue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ThreadSafeQueue.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ThreadSafeQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ThreadSafeQueue.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
 
 #include <deque>
 #include "ProducerConsumer.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRAcceptor.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRAcceptor.cpp Fri Apr 13 13:58:27 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "../Acceptor.h"
-#include "../ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
 #include "LFProcessor.h"
 #include "LFSessionContext.h"
 #include "APRBase.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include "APRBase.h"
 
 using namespace qpid::sys;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.h Fri Apr 13 13:58:27 2007
@@ -24,7 +24,7 @@
 #include <string>
 #include <apr_thread_mutex.h>
 #include <apr_errno.h>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.h Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
 #define _APRSocket_
 
 #include <apr_network_io.h>
-#include "../../framing/Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <sstream>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include "LFProcessor.h"
 #include "APRBase.h"
 #include "LFSessionContext.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.h Fri Apr 13 13:58:27 2007
@@ -24,9 +24,9 @@
 #include <apr_poll.h>
 #include <iostream>
 #include <vector>
-#include "../Monitor.h"
-#include "../Runnable.h"
-#include "../Thread.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Thread.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.cpp Fri Apr 13 13:58:27 2007
@@ -20,7 +20,7 @@
  */
 #include "LFSessionContext.h"
 #include "APRBase.h"
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include <assert.h>
 
 using namespace qpid::sys;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.h Fri Apr 13 13:58:27 2007
@@ -27,11 +27,11 @@
 #include <apr_poll.h>
 #include <apr_time.h>
 
-#include "../../framing/AMQFrame.h"
-#include "../../framing/Buffer.h"
-#include "../Monitor.h"
-#include "../ConnectionOutputHandler.h"
-#include "../ConnectionInputHandler.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
 
 #include "APRSocket.h"
 #include "LFProcessor.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp Fri Apr 13 13:58:27 2007
@@ -20,7 +20,7 @@
  */
 
 
-#include "../Socket.h"
+#include "qpid/sys/Socket.h"
 #include "APRBase.h"
 #include "APRPool.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../Thread.h"
+#include "qpid/sys/Thread.h"
 
 using namespace qpid::sys;
 using qpid::sys::Runnable;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.cpp Fri Apr 13 13:58:27 2007
@@ -31,8 +31,8 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/current_function.hpp>
 
-#include "../../QpidError.h"
-#include "../Monitor.h"
+#include "qpid/QpidError.h"
+#include "qpid/sys/Monitor.h"
 
 #include "check.h"
 #include "EventChannel.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.h Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
  *
  */
 
-#include "../../SharedObject.h"
-#include "../../ExceptionHolder.h"
+#include "qpid/SharedObject.h"
+#include "qpid/ExceptionHolder.h"
 #include <boost/function.hpp>
 #include <memory>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp Fri Apr 13 13:58:27 2007
@@ -26,14 +26,14 @@
 #include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include "../ConnectionOutputHandler.h"
-#include "../ConnectionInputHandler.h"
-#include "../ConnectionInputHandlerFactory.h"
-#include "../Acceptor.h"
-#include "../Socket.h"
-#include "../../framing/Buffer.h"
-#include "../../framing/AMQFrame.h"
-#include "../../Exception.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/Exception.h"
 
 #include "EventChannelConnection.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.cpp Fri Apr 13 13:58:27 2007
@@ -22,8 +22,8 @@
 #include <boost/assert.hpp>
 
 #include "EventChannelConnection.h"
-#include "../ConnectionInputHandlerFactory.h"
-#include "../../QpidError.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/QpidError.h"
 
 using namespace std;
 using namespace qpid;

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.h Fri Apr 13 13:58:27 2007
@@ -22,11 +22,11 @@
 #include <boost/ptr_container/ptr_deque.hpp>
 
 #include "EventChannelThreads.h"
-#include "../Monitor.h"
-#include "../ConnectionOutputHandler.h"
-#include "../ConnectionInputHandler.h"
-#include "../AtomicCount.h"
-#include "../../framing/AMQFrame.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/AtomicCount.h"
+#include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.cpp Fri Apr 13 13:58:27 2007
@@ -17,7 +17,7 @@
  */
 
 #include "EventChannelThreads.h"
-#include "../Runnable.h"
+#include "qpid/sys/Runnable.h"
 #include <iostream>
 using namespace std;
 #include <boost/bind.hpp>

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.h Fri Apr 13 13:58:27 2007
@@ -20,11 +20,11 @@
  */
 #include <vector>
 
-#include "../../Exception.h"
-#include "../Time.h"
-#include "../Monitor.h"
-#include "../Thread.h"
-#include "../AtomicCount.h"
+#include "qpid/Exception.h"
+#include "qpid/sys/Time.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/AtomicCount.h"
 #include "EventChannel.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/PosixAcceptor.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/PosixAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/PosixAcceptor.cpp Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
  *
  */
 
-#include "../Acceptor.h"
-#include "../../Exception.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp Fri Apr 13 13:58:27 2007
@@ -26,9 +26,9 @@
 
 #include <boost/format.hpp>
 
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include "check.h"
-#include "../Socket.h"
+#include "qpid/sys/Socket.h"
 
 using namespace qpid::sys;
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../Thread.h"
+#include "qpid/sys/Thread.h"
 
 void* qpid::sys::Thread::runRunnable(void* p)
 {

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h Fri Apr 13 13:58:27 2007
@@ -24,7 +24,7 @@
 
 #include <cerrno>
 #include <string>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRBase.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/AccumulatedAck.h"
+#include "qpid/broker/AccumulatedAck.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,19 +18,19 @@
  * under the License.
  *
  */
-#include "../broker/BrokerChannel.h"
-#include "../broker/BrokerMessage.h"
-#include "../broker/BrokerQueue.h"
-#include "../broker/FanOutExchange.h"
-#include "../broker/NullMessageStore.h"
+#include "qpid/broker/BrokerChannel.h"
+#include "qpid/broker/BrokerMessage.h"
+#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/FanOutExchange.h"
+#include "qpid/broker/NullMessageStore.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
-#include "../broker/Connection.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/broker/Connection.h"
+#include "qpid/framing/ProtocolInitiation.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 using namespace boost;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp Fri Apr 13 13:58:27 2007
@@ -21,13 +21,13 @@
 #include <vector>
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "../client/ClientChannel.h"
-#include "../client/ClientMessage.h"
-#include "../client/ClientQueue.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/BasicMessageChannel.h"
-#include "../client/MessageMessageChannel.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/ClientMessage.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/BasicMessageChannel.h"
+#include "qpid/client/MessageMessageChannel.h"
 
 using namespace std;
 using namespace boost;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/Configuration.h"
+#include "qpid/broker/Configuration.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp Fri Apr 13 13:58:27 2007
@@ -21,12 +21,12 @@
 
 #include <iostream>
 #include <boost/bind.hpp>
-#include "../framing/AMQHeartbeatBody.h"
-#include "../framing/AMQFrame.h"
-#include "../sys/posix/EventChannelConnection.h"
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/ConnectionInputHandlerFactory.h"
-#include "../sys/Socket.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/sys/posix/EventChannelConnection.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Socket.h"
 #include "qpid_test_plugin.h"
 #include "MockConnectionInputHandler.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "../sys/posix/EventChannel.h"
-#include "../sys/posix/check.h"
-#include "../sys/Runnable.h"
-#include "../sys/Socket.h"
-#include "../sys/Thread.h"
+#include "qpid/sys/posix/EventChannel.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Thread.h"
 #include "qpid_test_plugin.h"
 
 #include <sys/socket.h>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp Fri Apr 13 13:58:27 2007
@@ -21,8 +21,8 @@
 #include <iostream>
 #include <boost/bind.hpp>
 
-#include "../sys/Socket.h"
-#include "../sys/posix/EventChannelThreads.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/posix/EventChannelThreads.h"
 #include "qpid_test_plugin.h"
 
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp Fri Apr 13 13:58:27 2007
@@ -19,14 +19,14 @@
  *
  */
 
-#include "../broker/DeliverableMessage.h"
-#include "../broker/DirectExchange.h"
-#include "../broker/BrokerExchange.h"
-#include "../broker/BrokerQueue.h"
-#include "../broker/TopicExchange.h"
+#include "qpid/broker/DeliverableMessage.h"
+#include "qpid/broker/DirectExchange.h"
+#include "qpid/broker/BrokerExchange.h"
+#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/TopicExchange.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "../gen/BasicGetBody.h"
+#include "qpid/framing/BasicGetBody.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,25 +18,25 @@
  * under the License.
  *
  */
-#include "../gen/ConnectionRedirectBody.h"
-#include "../framing/ProtocolVersion.h"
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/ConnectionRedirectBody.h"
+#include "qpid/framing/ProtocolVersion.h"
+#include "qpid/framing/amqp_framing.h"
 #include <iostream>
 #include "qpid_test_plugin.h"
 #include <sstream>
 #include <typeinfo>
-#include "../QpidError.h"
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQRequestBody.h"
-#include "../framing/AMQResponseBody.h"
-#include "../framing/Requester.h"
-#include "../framing/Responder.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQRequestBody.h"
+#include "qpid/framing/AMQResponseBody.h"
+#include "qpid/framing/Requester.h"
+#include "qpid/framing/Responder.h"
 #include "InProcessBroker.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/ClientQueue.h"
-#include "../framing/Correlator.h"
-#include "../gen/BasicGetOkBody.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/framing/Correlator.h"
+#include "qpid/framing/BasicGetOkBody.h"
 #include <memory>
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp Fri Apr 13 13:58:27 2007
@@ -19,9 +19,9 @@
  *
  */
 
-#include "../broker/HeadersExchange.h"
-#include "../framing/FieldTable.h"
-#include "../framing/Value.h"
+#include "qpid/broker/HeadersExchange.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/Value.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::broker;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include "../broker/InMemoryContent.h"
+#include "qpid/broker/InMemoryContent.h"
 #include "qpid_test_plugin.h"
-#include "../gen/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
 #include <iostream>
 #include <list>
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
 
 using std::list;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h Fri Apr 13 13:58:27 2007
@@ -18,12 +18,12 @@
  * limitations under the License.
  *
  */
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQFrame.h"
-#include "../broker/Broker.h"
-#include "../broker/Connection.h"
-#include "../client/Connector.h"
-#include "../client/Connection.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Connection.h"
+#include "qpid/client/Connector.h"
+#include "qpid/client/Connection.h"
 
 #include <vector>
 #include <iostream>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include "../broker/LazyLoadedContent.h"
-#include "../gen/AMQP_HighestVersion.h"
-#include "../broker/NullMessageStore.h"
+#include "qpid/broker/LazyLoadedContent.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/broker/NullMessageStore.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
 #include <sstream>
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
 using std::list;
 using std::string;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "../Exception.h"
-#include "../broker/BrokerMessage.h"
-#include "../broker/MessageBuilder.h"
-#include "../broker/NullMessageStore.h"
-#include "../framing/Buffer.h"
+#include "qpid/Exception.h"
+#include "qpid/broker/BrokerMessage.h"
+#include "qpid/broker/MessageBuilder.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/framing/Buffer.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp Fri Apr 13 13:58:27 2007
@@ -19,11 +19,11 @@
  *
  */
 //#include <iostream>
-//#include "../gen/AMQP_HighestVersion.h>
-#include "../framing/amqp_framing.h"
+//#include "qpid/framing/AMQP_HighestVersion.h>
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
-#include "../broker/BrokerAdapter.h"
+#include "qpid/broker/BrokerAdapter.h"
 
 using namespace qpid::framing;
 using namespace qpid::broker;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "../broker/BrokerMessage.h"
+#include "qpid/broker/BrokerMessage.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
 
 using namespace boost;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h Fri Apr 13 13:58:27 2007
@@ -19,11 +19,11 @@
  *
  */
 
-#include "../framing/MethodContext.h"
-#include "../framing/ChannelAdapter.h"
-#include "../framing/OutputHandler.h"
-#include "../framing/AMQFrame.h"
-#include "../gen/BasicGetBody.h"
+#include "qpid/framing/MethodContext.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/BasicGetBody.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h Fri Apr 13 13:58:27 2007
@@ -19,10 +19,10 @@
  *
  */
 
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/ConnectionInputHandlerFactory.h"
-#include "../sys/Monitor.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/framing/ProtocolInitiation.h"
 
 struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp Fri Apr 13 13:58:27 2007
@@ -25,10 +25,10 @@
 
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "../sys/ProducerConsumer.h"
-#include "../sys/Thread.h"
-#include "../gen/AMQP_HighestVersion.h"
-#include "../sys/AtomicCount.h"
+#include "qpid/sys/ProducerConsumer.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/sys/AtomicCount.h"
 
 using namespace qpid;
 using namespace sys;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/QueuePolicy.h"
+#include "qpid/broker/QueuePolicy.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::broker;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp Fri Apr 13 13:58:27 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "../broker/QueueRegistry.h"
+#include "qpid/broker/QueueRegistry.h"
 #include "qpid_test_plugin.h"
 #include <string>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "../broker/BrokerQueue.h"
-#include "../broker/QueueRegistry.h"
+#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/QueueRegistry.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include "MockChannel.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp Fri Apr 13 13:58:27 2007
@@ -21,11 +21,11 @@
 #include <iostream>
 #include <memory>
 #include "qpid_test_plugin.h"
-#include "../broker/Reference.h"
-#include "../broker/BrokerMessageMessage.h"
-#include "../gen/MessageTransferBody.h"
-#include "../gen/MessageAppendBody.h"
-#include "../broker/CompletionHandler.h"
+#include "qpid/broker/Reference.h"
+#include "qpid/broker/BrokerMessageMessage.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/MessageAppendBody.h"
+#include "qpid/broker/CompletionHandler.h"
 
 using namespace boost;
 using namespace qpid;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp Fri Apr 13 13:58:27 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "../broker/TopicExchange.h"
+#include "qpid/broker/TopicExchange.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::broker;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "../broker/NullMessageStore.h"
-#include "../broker/RecoveryManager.h"
-#include "../broker/TxAck.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/RecoveryManager.h"
+#include "qpid/broker/TxAck.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/TxBuffer.h"
+#include "qpid/broker/TxBuffer.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <vector>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp Fri Apr 13 13:58:27 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "../broker/NullMessageStore.h"
-#include "../broker/RecoveryManager.h"
-#include "../broker/TxPublish.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/RecoveryManager.h"
+#include "qpid/broker/TxPublish.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ValueTest.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ValueTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ValueTest.cpp Fri Apr 13 13:58:27 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "../framing/Value.h"
+#include "qpid/framing/Value.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp Fri Apr 13 13:58:27 2007
@@ -28,13 +28,13 @@
 
 #include <iostream>
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientMessage.h"
-#include "../client/MessageListener.h"
-#include "../sys/Monitor.h"
-#include "../framing/FieldTable.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientMessage.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/framing/FieldTable.h"
 
 using namespace qpid::client;
 using namespace qpid::sys;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp Fri Apr 13 13:58:27 2007
@@ -27,13 +27,13 @@
  * sender-specified private queue.
  */
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/ClientQueue.h"
-#include "../sys/Time.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp Fri Apr 13 13:58:27 2007
@@ -32,13 +32,13 @@
  * listening).
  */
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/ClientQueue.h"
-#include "../sys/Time.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp Fri Apr 13 13:58:27 2007
@@ -34,15 +34,15 @@
  * subscriber shutdown.
  */
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/ClientQueue.h"
-#include "../sys/Monitor.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/sys/Monitor.h"
 #include <unistd.h>
-#include "../sys/Time.h"
+#include "qpid/sys/Time.h"
 #include <cstdlib>
 #include <iostream>