qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r524769 [2/3] - in /incubator/qpid/trunk/qpid/cpp: ./ gen/ gentools/templ.cpp/ lib/ src/ src/broker/ src/client/ src/framing/ src/gen/ src/sys/ src/sys/apr/ src/sys/posix/ src/tests/ tests/
Date Mon, 02 Apr 2007 11:40:57 GMT
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientQueue.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientQueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientQueue.cpp Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <ClientQueue.h>
+#include "ClientQueue.h"
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true), durable(false){}
 

Modified: incubator/qpid/trunk/qpid/cpp/src/client/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/Connection.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/Connection.cpp Mon Apr  2 04:40:48 2007
@@ -22,13 +22,13 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 
-#include <Connection.h>
-#include <ClientChannel.h>
-#include <ClientMessage.h>
-#include <QpidError.h>
+#include "Connection.h"
+#include "ClientChannel.h"
+#include "ClientMessage.h"
+#include "../QpidError.h"
 #include <iostream>
 #include <sstream>
-#include <MethodBodyInstances.h>
+#include "MethodBodyInstances.h"
 #include <functional>
 
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/client/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/Connection.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/Connection.h Mon Apr  2 04:40:48 2007
@@ -23,11 +23,11 @@
  */
 #include <map>
 #include <string>
-#include "QpidError.h"
+#include "../QpidError.h"
 #include "ClientChannel.h"
 #include "Connector.h"
-#include "sys/ShutdownHandler.h"
-#include "sys/TimeoutHandler.h"
+#include "../sys/ShutdownHandler.h"
+#include "../sys/TimeoutHandler.h"
 
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/client/Connector.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/Connector.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/Connector.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/Connector.cpp Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 #include <iostream>
-#include <QpidError.h>
-#include <sys/Time.h>
+#include "../QpidError.h"
+#include "../sys/Time.h"
 #include "Connector.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/client/Connector.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/Connector.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/Connector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/Connector.h Mon Apr  2 04:40:48 2007
@@ -22,16 +22,16 @@
 #define _Connector_
 
 
-#include <framing/InputHandler.h>
-#include <framing/OutputHandler.h>
-#include <framing/InitiationHandler.h>
-#include <framing/ProtocolInitiation.h>
-#include <ProtocolVersion.h>
-#include <sys/ShutdownHandler.h>
-#include <sys/TimeoutHandler.h>
-#include <sys/Thread.h>
-#include <sys/Monitor.h>
-#include <sys/Socket.h>
+#include "../framing/InputHandler.h"
+#include "../framing/OutputHandler.h"
+#include "../framing/InitiationHandler.h"
+#include "../framing/ProtocolInitiation.h"
+#include "../framing/ProtocolVersion.h"
+#include "../sys/ShutdownHandler.h"
+#include "../sys/TimeoutHandler.h"
+#include "../sys/Thread.h"
+#include "../sys/Monitor.h"
+#include "../sys/Socket.h"
 
 namespace qpid {
 

Modified: incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.cpp Mon Apr  2 04:40:48 2007
@@ -20,7 +20,7 @@
  */
 
 #include "IncomingMessage.h"
-#include "Exception.h"
+#include "../Exception.h"
 #include "ClientMessage.h"
 #include <boost/format.hpp>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.h Mon Apr  2 04:40:48 2007
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "sys/Mutex.h"
+#include "../sys/Mutex.h"
 #include <map>
 #include <vector>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/client/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/Makefile.am?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/Makefile.am Mon Apr  2 04:40:48 2007
@@ -1,13 +1,10 @@
 AM_CXXFLAGS = $(WARNING_CFLAGS)
 INCLUDES =				\
-  -I$(top_srcdir)/gen			\
-  -I$(top_srcdir)/lib/common		\
-  -I$(top_srcdir)/lib/common/sys	\
-  -I$(top_srcdir)/lib/common/framing	\
+  -I$(srcdir)/../gen			\
   $(APR_CXXFLAGS)
 
 lib_LTLIBRARIES = libqpidclient.la
-libqpidclient_la_LIBADD = ../common/libqpidcommon.la
+libqpidclient_la_LIBADD = ../libqpidcommon.la
 libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
 libqpidclient_la_SOURCES =			\
   ClientChannel.cpp				\

Modified: incubator/qpid/trunk/qpid/cpp/src/client/MessageChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/MessageChannel.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/MessageChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/MessageChannel.h Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 
-#include "shared_ptr.h"
-#include "sys/Runnable.h"
+#include "../shared_ptr.h"
+#include "../sys/Runnable.h"
 #include "AckMode.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.cpp Mon Apr  2 04:40:48 2007
@@ -19,6 +19,6 @@
  *
  */
 
-#include <MessageListener.h>
+#include "MessageListener.h"
 
 qpid::client::MessageListener::~MessageListener() {}

Modified: incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.h Mon Apr  2 04:40:48 2007
@@ -23,7 +23,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include <ClientMessage.h>
+#include "ClientMessage.h"
 
 namespace qpid {
 namespace client {

Modified: incubator/qpid/trunk/qpid/cpp/src/client/MethodBodyInstances.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/MethodBodyInstances.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/MethodBodyInstances.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/MethodBodyInstances.h Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <framing/amqp_framing.h>
+#include "../framing/amqp_framing.h"
 
 #ifndef _MethodBodyInstances_h_
 #define _MethodBodyInstances_h_

Modified: incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.cpp Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <QpidError.h>
+#include "../QpidError.h"
 #include <boost/format.hpp>
 #include "ResponseHandler.h"
-#include "AMQMethodBody.h"
+#include "../framing/AMQMethodBody.h"
 
 using namespace qpid::sys;
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.h Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "shared_ptr.h"
-#include <sys/Monitor.h>
+#include "../shared_ptr.h"
+#include "../sys/Monitor.h"
 
 #ifndef _ResponseHandler_
 #define _ResponseHandler_

Modified: incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.cpp Mon Apr  2 04:40:48 2007
@@ -19,6 +19,6 @@
  *
  */
 
-#include <ReturnedMessageHandler.h>
+#include "ReturnedMessageHandler.h"
 
 qpid::client::ReturnedMessageHandler::~ReturnedMessageHandler() {}

Modified: incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.h Mon Apr  2 04:40:48 2007
@@ -23,7 +23,7 @@
 #ifndef _ReturnedMessageHandler_
 #define _ReturnedMessageHandler_
 
-#include <ClientMessage.h>
+#include "ClientMessage.h"
 
 namespace qpid {
 namespace client {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include <AMQBody.h>
+#include "AMQBody.h"
 #include <iostream>
 
 std::ostream& qpid::framing::operator<<(std::ostream& out, const qpid::framing::AMQBody& body) 

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.h Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 #include <boost/shared_ptr.hpp>
-#include <amqp_types.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "Buffer.h"
 
 #ifndef _AMQBody_
 #define _AMQBody_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.cpp Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <AMQContentBody.h>
+#include "AMQContentBody.h"
 #include <iostream>
 
 qpid::framing::AMQContentBody::AMQContentBody(){

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.h Mon Apr  2 04:40:48 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
 
 #ifndef _AMQContentBody_
 #define _AMQContentBody_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQDataBlock.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQDataBlock.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQDataBlock.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQDataBlock.h Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <Buffer.h>
+#include "Buffer.h"
 
 #ifndef _AMQDataBlock_
 #define _AMQDataBlock_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.cpp Mon Apr  2 04:40:48 2007
@@ -21,8 +21,8 @@
  */
 #include <boost/format.hpp>
 
-#include <AMQFrame.h>
-#include <QpidError.h>
+#include "AMQFrame.h"
+#include "../QpidError.h"
 #include "AMQRequestBody.h"
 #include "AMQResponseBody.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h Mon Apr  2 04:40:48 2007
@@ -23,16 +23,16 @@
  */
 #include <boost/cast.hpp>
 
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <AMQDataBlock.h>
-#include <AMQMethodBody.h>
-#include <AMQHeaderBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeartbeatBody.h>
-#include <AMQP_MethodVersionMap.h>
-#include <AMQP_HighestVersion.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "AMQDataBlock.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "AMQP_MethodVersionMap.h"
+#include "AMQP_HighestVersion.h"
+#include "Buffer.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.cpp Mon Apr  2 04:40:48 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <AMQHeaderBody.h>
-#include <QpidError.h>
-#include <BasicHeaderProperties.h>
+#include "AMQHeaderBody.h"
+#include "../QpidError.h"
+#include "BasicHeaderProperties.h"
 
 qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
     createProperties(classId);

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.h Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
-#include <HeaderProperties.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+#include "HeaderProperties.h"
 
 #ifndef _AMQHeaderBody_
 #define _AMQHeaderBody_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include <AMQHeartbeatBody.h>
+#include "AMQHeartbeatBody.h"
 #include <iostream>
 
 qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {}

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.h Mon Apr  2 04:40:48 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
 
 #ifndef _AMQHeartbeatBody_
 #define _AMQHeartbeatBody_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp Mon Apr  2 04:40:48 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <AMQFrame.h>
-#include <AMQMethodBody.h>
-#include <QpidError.h>
+#include "AMQFrame.h"
+#include "AMQMethodBody.h"
+#include "../QpidError.h"
 #include "AMQP_MethodVersionMap.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h Mon Apr  2 04:40:48 2007
@@ -22,11 +22,11 @@
  *
  */
 #include <iostream>
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
-#include <AMQP_ServerOperations.h>
-#include <MethodContext.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+#include "AMQP_ServerOperations.h"
+#include "MethodContext.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.cpp Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <BasicHeaderProperties.h>
+#include "BasicHeaderProperties.h"
 
 //TODO: This could be easily generated from the spec
 

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.h Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <Buffer.h>
-#include <FieldTable.h>
-#include <HeaderProperties.h>
+#include "amqp_types.h"
+#include "Buffer.h"
+#include "FieldTable.h"
+#include "HeaderProperties.h"
 
 #ifndef _BasicHeaderProperties_
 #define _BasicHeaderProperties_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/BodyHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/BodyHandler.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/BodyHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/BodyHandler.cpp Mon Apr  2 04:40:48 2007
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include "QpidError.h"
+#include "../QpidError.h"
 #include "BodyHandler.h"
-#include <AMQRequestBody.h>
-#include <AMQResponseBody.h>
-#include <AMQMethodBody.h>
-#include <AMQHeaderBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeartbeatBody.h>
+#include "AMQRequestBody.h"
+#include "AMQResponseBody.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
 
 using namespace qpid::framing;
 using namespace boost;

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.cpp Mon Apr  2 04:40:48 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <Buffer.h>
-#include <FramingContent.h> 
-#include <FieldTable.h> 
+#include "Buffer.h"
+#include "FramingContent.h" 
+#include "FieldTable.h" 
 
 qpid::framing::Buffer::Buffer(uint32_t _size) : size(_size), owner(true), position(0), limit(_size){
     data = new char[size];

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.h Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
+#include "amqp_types.h"
 
 #ifndef _Buffer_
 #define _Buffer_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
 
 #include "ChannelAdapter.h"
 #include "AMQFrame.h"
-#include "Exception.h"
+#include "../Exception.h"
 
 using boost::format;
 

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.h Mon Apr  2 04:40:48 2007
@@ -27,7 +27,7 @@
 #include "BodyHandler.h"
 #include "Requester.h"
 #include "Responder.h"
-#include "framing/amqp_types.h"
+#include "amqp_types.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.cpp Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <FieldTable.h>
-#include <QpidError.h>
-#include <Buffer.h>
-#include <Value.h>
+#include "FieldTable.h"
+#include "../QpidError.h"
+#include "Buffer.h"
+#include "Value.h"
 #include <assert.h>
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.h Mon Apr  2 04:40:48 2007
@@ -22,7 +22,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <map>
-#include <amqp_types.h>
+#include "amqp_types.h"
 
 #ifndef _FieldTable_
 #define _FieldTable_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/FramingContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/FramingContent.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/FramingContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/FramingContent.cpp Mon Apr  2 04:40:48 2007
@@ -22,7 +22,7 @@
 
 #include "Buffer.h"
 #include "FramingContent.h"
-#include <QpidError.h>
+#include "../QpidError.h"
 #include <sstream>
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/HeaderProperties.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/HeaderProperties.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/HeaderProperties.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/HeaderProperties.h Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "Buffer.h"
 
 #ifndef _HeaderProperties_
 #define _HeaderProperties_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.cpp Mon Apr  2 04:40:48 2007
@@ -19,6 +19,6 @@
  *
  */
 
-#include <InitiationHandler.h>
+#include "InitiationHandler.h"
 
 qpid::framing::InitiationHandler::~InitiationHandler() {}

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.h Mon Apr  2 04:40:48 2007
@@ -23,7 +23,7 @@
 #ifndef _InitiationHandler_
 #define _InitiationHandler_
 
-#include <ProtocolInitiation.h>
+#include "ProtocolInitiation.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/InputHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/InputHandler.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/InputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/InputHandler.h Mon Apr  2 04:40:48 2007
@@ -21,7 +21,7 @@
  *
  */
 
-#include <AMQFrame.h>
+#include "AMQFrame.h"
 #include <boost/noncopyable.hpp>
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.cpp Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <ProtocolInitiation.h>
+#include "ProtocolInitiation.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.h Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <Buffer.h>
-#include <AMQDataBlock.h>
-#include <ProtocolVersion.h>
+#include "amqp_types.h"
+#include "Buffer.h"
+#include "AMQDataBlock.h"
+#include "ProtocolVersion.h"
 
 #ifndef _ProtocolInitiation_
 #define _ProtocolInitiation_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.cpp Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <ProtocolVersion.h>
+#include "ProtocolVersion.h"
 #include <sstream>
 
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.h Mon Apr  2 04:40:48 2007
@@ -21,7 +21,7 @@
 #ifndef _ProtocolVersion_
 #define _ProtocolVersion_
 
-#include <amqp_types.h>
+#include "amqp_types.h"
 
 namespace qpid
 {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <boost/format.hpp>
-#include <ProtocolVersionException.h>
+#include "ProtocolVersionException.h"
 
 
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.h Mon Apr  2 04:40:48 2007
@@ -22,8 +22,8 @@
 #ifndef _ProtocolVersionException_
 #define _ProtocolVersionException_
 
-#include <Exception.h>
-#include <ProtocolVersion.h>
+#include "../Exception.h"
+#include "ProtocolVersion.h"
 #include <string>
 #include <vector>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/Requester.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/Requester.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/Requester.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/Requester.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
 #include <boost/format.hpp>
 
 #include "Requester.h"
-#include "QpidError.h"
+#include "../QpidError.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/Responder.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/Responder.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/Responder.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/Responder.cpp Mon Apr  2 04:40:48 2007
@@ -18,7 +18,7 @@
 #include <boost/format.hpp>
 
 #include "Responder.h"
-#include "QpidError.h"
+#include "../QpidError.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/Value.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/Value.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/Value.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/Value.cpp Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <Value.h>
-#include <Buffer.h>
-#include <FieldTable.h>
-#include <QpidError.h>
+#include "Value.h"
+#include "Buffer.h"
+#include "FieldTable.h"
+#include "../QpidError.h"
 #include <sstream>
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/Value.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/Value.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/Value.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/Value.h Mon Apr  2 04:40:48 2007
@@ -20,8 +20,8 @@
  */
 #include <iostream>
 #include <vector>
-#include <amqp_types.h>
-#include <FieldTable.h>
+#include "amqp_types.h"
+#include "FieldTable.h"
 
 #ifndef _Value_
 #define _Value_

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h Mon Apr  2 04:40:48 2007
@@ -18,19 +18,19 @@
  * under the License.
  *
  */
-#include <amqp_types.h>
-#include <AMQFrame.h>
-#include <AMQBody.h>
-#include <BodyHandler.h>
-#include <AMQMethodBody.h>
-#include <AMQHeaderBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeartbeatBody.h>
-#include <AMQP_MethodVersionMap.h>
-#include <InputHandler.h>
-#include <OutputHandler.h>
-#include <InitiationHandler.h>
-#include <ProtocolInitiation.h>
-#include <BasicHeaderProperties.h>
-#include <ProtocolVersion.h>
-#include <ProtocolVersionException.h>
+#include "amqp_types.h"
+#include "AMQFrame.h"
+#include "AMQBody.h"
+#include "BodyHandler.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "AMQP_MethodVersionMap.h"
+#include "InputHandler.h"
+#include "OutputHandler.h"
+#include "InitiationHandler.h"
+#include "ProtocolInitiation.h"
+#include "BasicHeaderProperties.h"
+#include "ProtocolVersion.h"
+#include "ProtocolVersionException.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/amqp_types.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/amqp_types.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/amqp_types.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/amqp_types.h Mon Apr  2 04:40:48 2007
@@ -35,7 +35,7 @@
 typedef unsigned __int64 uint64_t;
 #endif
 #ifndef _WINDOWS
-#include "stdint.h"
+#include <stdint.h>
 #endif
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/gen/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/gen/Makefile.am?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/gen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/gen/Makefile.am Mon Apr  2 04:40:48 2007
@@ -14,8 +14,8 @@
 #
 if CAN_GENERATE_CODE
 
-gentools_dir = $(srcdir)/../gentools
-spec_dir = $(srcdir)/../../specs
+gentools_dir = $(srcdir)/../../gentools
+spec_dir = $(srcdir)/../../../specs
 
 # FIXME aconway 2007-01-04: Enabling Basic class until
 # new messaging class is ready to replace it.

Modified: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Mon Apr  2 04:40:48 2007
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-#include <Broker.h>
-#include <Configuration.h>
+#include "broker/Broker.h"
+#include "broker/Configuration.h"
 #include <signal.h>
 #include <iostream>
 #include <memory>
 #include <cerrno>
-#include <config.h>
+#include "../config.h"
 #include <unistd.h>
 
 static char const* programName = "qpidd";

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Acceptor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Acceptor.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Acceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Acceptor.h Mon Apr  2 04:40:48 2007
@@ -23,7 +23,7 @@
  */
 
 #include <stdint.h>
-#include <SharedObject.h>
+#include "../SharedObject.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Condition.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Condition.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Condition.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Condition.h Mon Apr  2 04:40:48 2007
@@ -24,11 +24,11 @@
 
 #include <sys/errno.h>
 #include <boost/noncopyable.hpp>
-#include <sys/Mutex.h>
-#include <sys/Time.h>
+#include "Mutex.h"
+#include "Time.h"
 
 #ifdef USE_APR
-#  include <apr_thread_cond.h>
+#include <apr_thread_cond.h>
 #endif
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionInputHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionInputHandler.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionInputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionInputHandler.h Mon Apr  2 04:40:48 2007
@@ -21,10 +21,10 @@
 #ifndef _ConnectionInputHandler_
 #define _ConnectionInputHandler_
 
-#include <InputHandler.h>
-#include <InitiationHandler.h>
-#include <ProtocolInitiation.h>
-#include <sys/TimeoutHandler.h>
+#include "../framing/InputHandler.h"
+#include "../framing/InitiationHandler.h"
+#include "../framing/ProtocolInitiation.h"
+#include "TimeoutHandler.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionOutputHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionOutputHandler.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionOutputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionOutputHandler.h Mon Apr  2 04:40:48 2007
@@ -21,7 +21,7 @@
 #ifndef _ConnectionOutputHandler_
 #define _ConnectionOutputHandler_
 
-#include <OutputHandler.h>
+#include "../framing/OutputHandler.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Module.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Module.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Module.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Module.h Mon Apr  2 04:40:48 2007
@@ -23,7 +23,7 @@
  */
 #include <boost/noncopyable.hpp>
 #include <iostream>
-#include <QpidError.h>
+#include "../QpidError.h"
 
 namespace qpid {
 namespace sys {
@@ -99,8 +99,8 @@
 // APR ================================================================
 #if USE_APR
 
-#include <apr/APRBase.h>
-#include <apr/APRPool.h>
+#include "apr/APRBase.h"
+#include "apr/APRPool.h"
 
 template <class T> void Module<T>::load(const std::string& name)
 {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Monitor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Monitor.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Monitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Monitor.h Mon Apr  2 04:40:48 2007
@@ -23,10 +23,10 @@
  */
 
 #include <sys/errno.h>
-#include <sys/Condition.h>
+#include "Condition.h"
 
 #ifdef USE_APR
-#  include <apr_thread_cond.h>
+#include <apr_thread_cond.h>
 #endif
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Mutex.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Mutex.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Mutex.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Mutex.h Mon Apr  2 04:40:48 2007
@@ -20,12 +20,12 @@
  */
 
 #ifdef USE_APR
-#  include <apr_thread_mutex.h>
-#  include <apr/APRBase.h>
-#  include <apr/APRPool.h>
+#include <apr_thread_mutex.h>
+#include "apr/APRBase.h"
+#include "apr/APRPool.h"
 #else
-#  include <pthread.h>
-#  include <posix/check.h>
+#include <pthread.h>
+#include "posix/check.h"
 #endif
 #include <boost/noncopyable.hpp>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.cpp Mon Apr  2 04:40:48 2007
@@ -17,7 +17,7 @@
  */
 
 
-#include "QpidError.h"
+#include "../QpidError.h"
 #include "ScopedIncrement.h"
 #include "ProducerConsumer.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.h Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 #include <boost/noncopyable.hpp>
-#include "Exception.h"
-#include "sys/Monitor.h"
+#include "../Exception.h"
+#include "Monitor.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Socket.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Socket.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Socket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Socket.h Mon Apr  2 04:40:48 2007
@@ -23,10 +23,10 @@
  */
 
 #include <string>
-#include <sys/Time.h>
+#include "Time.h"
 
 #ifdef USE_APR
-#  include <apr_network_io.h>
+#include <apr_network_io.h>
 #endif
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Thread.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Thread.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Thread.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Thread.h Mon Apr  2 04:40:48 2007
@@ -22,16 +22,16 @@
  *
  */
 
-#include <sys/Runnable.h>
+#include "Runnable.h"
 
 #ifdef USE_APR
-#  include <apr_thread_proc.h>
-#  include <apr_portable.h>
-#  include <apr/APRPool.h>
-#  include <apr/APRBase.h>
+#include <apr_thread_proc.h>
+#include <apr_portable.h>
+#include "apr/APRPool.h"
+#include "apr/APRBase.h"
 #else
-#  include <posix/check.h>
-#  include <pthread.h>
+#include "posix/check.h"
+#include <pthread.h>
 #endif
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/ThreadSafeQueue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/ThreadSafeQueue.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/ThreadSafeQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/ThreadSafeQueue.h Mon Apr  2 04:40:48 2007
@@ -21,7 +21,7 @@
 
 #include <deque>
 #include "ProducerConsumer.h"
-#include "Exception.h"
+#include "../Exception.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/Time.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/Time.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/Time.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/Time.h Mon Apr  2 04:40:48 2007
@@ -25,9 +25,9 @@
 #include <stdint.h>
 
 #ifdef USE_APR
-#  include <apr_time.h>
+#include <apr_time.h>
 #else
-#  include <time.h>
+#include <time.h>
 #endif
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRAcceptor.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRAcceptor.cpp Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <sys/Acceptor.h>
-#include <sys/ConnectionInputHandlerFactory.h>
+#include "../Acceptor.h"
+#include "../ConnectionInputHandlerFactory.h"
 #include "LFProcessor.h"
 #include "LFSessionContext.h"
 #include "APRBase.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include <QpidError.h>
+#include "../../QpidError.h"
 #include "APRBase.h"
 
 using namespace qpid::sys;

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.h Mon Apr  2 04:40:48 2007
@@ -24,7 +24,7 @@
 #include <string>
 #include <apr_thread_mutex.h>
 #include <apr_errno.h>
-#include <QpidError.h>
+#include "../../QpidError.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRSocket.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRSocket.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRSocket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRSocket.h Mon Apr  2 04:40:48 2007
@@ -22,7 +22,7 @@
 #define _APRSocket_
 
 #include <apr_network_io.h>
-#include <Buffer.h>
+#include "../../framing/Buffer.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 #include <sstream>
-#include <QpidError.h>
+#include "../../QpidError.h"
 #include "LFProcessor.h"
 #include "APRBase.h"
 #include "LFSessionContext.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.h Mon Apr  2 04:40:48 2007
@@ -24,9 +24,9 @@
 #include <apr_poll.h>
 #include <iostream>
 #include <vector>
-#include <sys/Monitor.h>
-#include <sys/Runnable.h>
-#include <sys/Thread.h>
+#include "../Monitor.h"
+#include "../Runnable.h"
+#include "../Thread.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFSessionContext.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFSessionContext.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFSessionContext.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFSessionContext.cpp Mon Apr  2 04:40:48 2007
@@ -20,7 +20,7 @@
  */
 #include "LFSessionContext.h"
 #include "APRBase.h"
-#include <QpidError.h>
+#include "../../QpidError.h"
 #include <assert.h>
 
 using namespace qpid::sys;

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

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/Socket.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/Socket.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/Socket.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/Socket.cpp Mon Apr  2 04:40:48 2007
@@ -20,9 +20,9 @@
  */
 
 
-#include <sys/Socket.h>
-#include <apr/APRBase.h>
-#include <apr/APRPool.h>
+#include "../Socket.h"
+#include "APRBase.h"
+#include "APRPool.h"
 
 
 using namespace qpid::sys;

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/apr/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/apr/Thread.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/apr/Thread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/apr/Thread.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include <sys/Thread.h>
+#include "../Thread.h"
 
 using namespace qpid::sys;
 using qpid::sys::Runnable;

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.cpp Mon Apr  2 04:40:48 2007
@@ -31,8 +31,8 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/current_function.hpp>
 
-#include <QpidError.h>
-#include <sys/Monitor.h>
+#include "../../QpidError.h"
+#include "../Monitor.h"
 
 #include "check.h"
 #include "EventChannel.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.h Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 
-#include <SharedObject.h>
-#include <ExceptionHolder.h>
+#include "../../SharedObject.h"
+#include "../../ExceptionHolder.h"
 #include <boost/function.hpp>
 #include <memory>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelAcceptor.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelAcceptor.cpp Mon Apr  2 04:40:48 2007
@@ -26,14 +26,14 @@
 #include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include <sys/ConnectionOutputHandler.h>
-#include <sys/ConnectionInputHandler.h>
-#include <sys/ConnectionInputHandlerFactory.h>
-#include <sys/Acceptor.h>
-#include <sys/Socket.h>
-#include <framing/Buffer.h>
-#include <framing/AMQFrame.h>
-#include <Exception.h>
+#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 "EventChannelConnection.h"
 

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

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

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

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

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/PosixAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/PosixAcceptor.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/PosixAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/PosixAcceptor.cpp Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 
-#include <sys/Acceptor.h>
-#include <Exception.h>
+#include "../Acceptor.h"
+#include "../../Exception.h"
 
 namespace qpid {
 namespace sys {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/Socket.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/Socket.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/Socket.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/Socket.cpp Mon Apr  2 04:40:48 2007
@@ -26,9 +26,9 @@
 
 #include <boost/format.hpp>
 
-#include <QpidError.h>
-#include <posix/check.h>
-#include <sys/Socket.h>
+#include "../../QpidError.h"
+#include "check.h"
+#include "../Socket.h"
 
 using namespace qpid::sys;
 

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/Thread.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/Thread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/Thread.cpp Mon Apr  2 04:40:48 2007
@@ -19,7 +19,7 @@
  *
  */
 
-#include <sys/Thread.h>
+#include "../Thread.h"
 
 void* qpid::sys::Thread::runRunnable(void* p)
 {

Modified: incubator/qpid/trunk/qpid/cpp/src/sys/posix/check.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/sys/posix/check.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/sys/posix/check.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/sys/posix/check.h Mon Apr  2 04:40:48 2007
@@ -24,7 +24,7 @@
 
 #include <cerrno>
 #include <string>
-#include <QpidError.h>
+#include "../../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <apr/APRBase.h>
-#include <qpid_test_plugin.h>
+#include "../sys/apr/APRBase.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 
 using namespace qpid::sys;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <AccumulatedAck.h>
-#include <qpid_test_plugin.h>
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,19 +18,19 @@
  * under the License.
  *
  */
-#include <BrokerChannel.h>
-#include <BrokerMessage.h>
-#include <BrokerQueue.h>
-#include <FanOutExchange.h>
-#include <NullMessageStore.h>
-#include <qpid_test_plugin.h>
+#include "../broker/BrokerChannel.h"
+#include "../broker/BrokerMessage.h"
+#include "../broker/BrokerQueue.h"
+#include "../broker/FanOutExchange.h"
+#include "../broker/NullMessageStore.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
-#include <AMQP_HighestVersion.h>
-#include "AMQFrame.h"
+#include "AMQP_HighestVersion.h"
+#include "../framing/AMQFrame.h"
 #include "MockChannel.h"
-#include "broker/Connection.h"
-#include "ProtocolInitiation.h"
+#include "../broker/Connection.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp Mon Apr  2 04:40:48 2007
@@ -21,11 +21,11 @@
 #include <vector>
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "ClientChannel.h"
-#include "ClientMessage.h"
-#include "ClientQueue.h"
-#include "ClientExchange.h"
-#include "client/MessageListener.h"
+#include "../client/ClientChannel.h"
+#include "../client/ClientMessage.h"
+#include "../client/ClientQueue.h"
+#include "../client/ClientExchange.h"
+#include "../client/MessageListener.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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <Configuration.h>
-#include <qpid_test_plugin.h>
+#include "../broker/Configuration.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 
 using namespace std;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp Mon Apr  2 04:40:48 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 "../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_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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include <posix/EventChannel.h>
-#include <posix/check.h>
-#include <sys/Runnable.h>
-#include <sys/Socket.h>
-#include <sys/Thread.h>
-#include <qpid_test_plugin.h>
+#include "../sys/posix/EventChannel.h"
+#include "../sys/posix/check.h"
+#include "../sys/Runnable.h"
+#include "../sys/Socket.h"
+#include "../sys/Thread.h"
+#include "qpid_test_plugin.h"
 
 #include <sys/socket.h>
 #include <signal.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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp Mon Apr  2 04:40:48 2007
@@ -21,9 +21,9 @@
 #include <iostream>
 #include <boost/bind.hpp>
 
-#include <sys/Socket.h>
-#include <posix/EventChannelThreads.h>
-#include <qpid_test_plugin.h>
+#include "../sys/Socket.h"
+#include "../sys/posix/EventChannelThreads.h"
+#include "qpid_test_plugin.h"
 
 
 using namespace std;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp Mon Apr  2 04:40:48 2007
@@ -19,12 +19,12 @@
  *
  */
 
-#include <DeliverableMessage.h>
-#include <DirectExchange.h>
-#include <BrokerExchange.h>
-#include <BrokerQueue.h>
-#include <TopicExchange.h>
-#include <qpid_test_plugin.h>
+#include "../broker/DeliverableMessage.h"
+#include "../broker/DirectExchange.h"
+#include "../broker/BrokerExchange.h"
+#include "../broker/BrokerQueue.h"
+#include "../broker/TopicExchange.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 #include "BasicGetBody.h"
 

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 #include <iostream>
-#include <amqp_framing.h>
-#include <qpid_test_plugin.h>
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp Mon Apr  2 04:40:48 2007
@@ -21,23 +21,23 @@
 #include <memory>
 #include <boost/lexical_cast.hpp>
 
-#include <ConnectionRedirectBody.h>
-#include <ProtocolVersion.h>
-#include <amqp_framing.h>
+#include "ConnectionRedirectBody.h"
+#include "../framing/ProtocolVersion.h"
+#include "../framing/amqp_framing.h"
 #include <iostream>
-#include <qpid_test_plugin.h>
+#include "qpid_test_plugin.h"
 #include <sstream>
 #include <typeinfo>
-#include <QpidError.h>
-#include <AMQP_HighestVersion.h>
-#include "AMQRequestBody.h"
-#include "AMQResponseBody.h"
-#include "Requester.h"
-#include "Responder.h"
+#include "../QpidError.h"
+#include "AMQP_HighestVersion.h"
+#include "../framing/AMQRequestBody.h"
+#include "../framing/AMQResponseBody.h"
+#include "../framing/Requester.h"
+#include "../framing/Responder.h"
 #include "InProcessBroker.h"
-#include "client/Connection.h"
-#include "client/ClientExchange.h"
-#include "client/ClientQueue.h"
+#include "../client/Connection.h"
+#include "../client/ClientExchange.h"
+#include "../client/ClientQueue.h"
 
 using namespace qpid;
 using namespace qpid::framing;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp Mon Apr  2 04:40:48 2007
@@ -19,8 +19,8 @@
  *
  */
 #include <iostream>
-#include <amqp_framing.h>
-#include <qpid_test_plugin.h>
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp Mon Apr  2 04:40:48 2007
@@ -19,10 +19,10 @@
  *
  */
 
-#include <HeadersExchange.h>
-#include <FieldTable.h>
-#include <Value.h>
-#include <qpid_test_plugin.h>
+#include "../broker/HeadersExchange.h"
+#include "../framing/FieldTable.h"
+#include "../framing/Value.h"
+#include "qpid_test_plugin.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include <InMemoryContent.h>
-#include <qpid_test_plugin.h>
-#include <AMQP_HighestVersion.h>
+#include "../broker/InMemoryContent.h"
+#include "qpid_test_plugin.h"
+#include "AMQP_HighestVersion.h"
 #include <iostream>
 #include <list>
-#include "AMQFrame.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h Mon Apr  2 04:40:48 2007
@@ -19,11 +19,11 @@
  *
  */
 #include "AMQP_HighestVersion.h"
-#include "framing/AMQFrame.h"
-#include "broker/Broker.h"
-#include "broker/Connection.h"
-#include "client/Connector.h"
-#include "client/Connection.h"
+#include "../framing/AMQFrame.h"
+#include "../broker/Broker.h"
+#include "../broker/Connection.h"
+#include "../client/Connector.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include <LazyLoadedContent.h>
-#include <AMQP_HighestVersion.h>
-#include <NullMessageStore.h>
-#include <qpid_test_plugin.h>
+#include "../broker/LazyLoadedContent.h"
+#include "AMQP_HighestVersion.h"
+#include "../broker/NullMessageStore.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
 #include <sstream>
-#include "AMQFrame.h"
+#include "../framing/AMQFrame.h"
 #include "MockChannel.h"
 using std::list;
 using std::string;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Mon Apr  2 04:40:48 2007
@@ -1,12 +1,6 @@
 AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS)
 INCLUDES =				\
-  -I$(top_srcdir)/gen			\
-  -I$(top_srcdir)/lib			\
-  -I$(top_srcdir)/lib/client		\
-  -I$(top_srcdir)/lib/broker		\
-  -I$(top_srcdir)/lib/common		\
-  -I$(top_srcdir)/lib/common/sys	\
-  -I$(top_srcdir)/lib/common/framing	\
+  -I$(srcdir)/../gen			\
   $(APR_CXXFLAGS)
 
 # Unit tests
@@ -95,9 +89,9 @@
 
 abs_builddir = @abs_builddir@
 extra_libs = $(CPPUNIT_LIBS)
-lib_client = $(abs_builddir)/../lib/client/libqpidclient.la
-lib_common = $(abs_builddir)/../lib/common/libqpidcommon.la
-lib_broker = $(abs_builddir)/../lib/broker/libqpidbroker.la
+lib_client = $(abs_builddir)/../client/libqpidclient.la
+lib_common = $(abs_builddir)/../libqpidcommon.la
+lib_broker = $(abs_builddir)/../broker/libqpidbroker.la
 
 gen.mk: Makefile.am
 	(					\

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include <Exception.h>
-#include <BrokerMessage.h>
-#include <MessageBuilder.h>
-#include <NullMessageStore.h>
-#include <Buffer.h>
-#include <qpid_test_plugin.h>
+#include "../Exception.h"
+#include "../broker/BrokerMessage.h"
+#include "../broker/MessageBuilder.h"
+#include "../broker/NullMessageStore.h"
+#include "../framing/Buffer.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
 #include "MockChannel.h"

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp Mon Apr  2 04:40:48 2007
@@ -20,10 +20,10 @@
  */
 //#include <iostream>
 //#include <AMQP_HighestVersion.h>
-#include <amqp_framing.h>
-#include <qpid_test_plugin.h>
+#include "../framing/amqp_framing.h"
+#include "qpid_test_plugin.h"
 
-#include <BrokerAdapter.h>
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include <BrokerMessage.h>
-#include <qpid_test_plugin.h>
+#include "../broker/BrokerMessage.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
-#include <AMQP_HighestVersion.h>
-#include "AMQFrame.h"
+#include "AMQP_HighestVersion.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h Mon Apr  2 04:40:48 2007
@@ -19,10 +19,10 @@
  *
  */
 
-#include "framing/MethodContext.h"
-#include "framing/ChannelAdapter.h"
-#include "framing/OutputHandler.h"
-#include "framing/AMQFrame.h"
+#include "../framing/MethodContext.h"
+#include "../framing/ChannelAdapter.h"
+#include "../framing/OutputHandler.h"
+#include "../framing/AMQFrame.h"
 #include "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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h Mon Apr  2 04:40:48 2007
@@ -19,10 +19,10 @@
  *
  */
 
-#include "sys/ConnectionInputHandler.h"
-#include "sys/ConnectionInputHandlerFactory.h"
-#include "sys/Monitor.h"
-#include "framing/ProtocolInitiation.h"
+#include "../sys/ConnectionInputHandler.h"
+#include "../sys/ConnectionInputHandlerFactory.h"
+#include "../sys/Monitor.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp Mon Apr  2 04:40:48 2007
@@ -23,12 +23,12 @@
 
 #include <boost/bind.hpp>
 
-#include <qpid_test_plugin.h>
+#include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "sys/ProducerConsumer.h"
-#include "sys/Thread.h"
+#include "../sys/ProducerConsumer.h"
+#include "../sys/Thread.h"
 #include "AMQP_HighestVersion.h"
-#include "sys/AtomicCount.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <QueuePolicy.h>
-#include <qpid_test_plugin.h>
+#include "../broker/QueuePolicy.h"
+#include "qpid_test_plugin.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp Mon Apr  2 04:40:48 2007
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <QueueRegistry.h>
-#include <qpid_test_plugin.h>
+#include "../broker/QueueRegistry.h"
+#include "qpid_test_plugin.h"
 #include <string>
 
 using namespace qpid::broker;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <BrokerQueue.h>
-#include <QueueRegistry.h>
-#include <qpid_test_plugin.h>
+#include "../broker/BrokerQueue.h"
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp Mon Apr  2 04:40:48 2007
@@ -21,11 +21,11 @@
 #include <iostream>
 #include <memory>
 #include "qpid_test_plugin.h"
-#include "Reference.h"
-#include "BrokerMessageMessage.h"
+#include "../broker/Reference.h"
+#include "../broker/BrokerMessageMessage.h"
 #include "MessageTransferBody.h"
 #include "MessageAppendBody.h"
-#include "CompletionHandler.h"
+#include "../broker/CompletionHandler.h"
 
 using namespace boost;
 using namespace qpid::broker;

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp Mon Apr  2 04:40:48 2007
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include <TopicExchange.h>
-#include <qpid_test_plugin.h>
+#include "../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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <NullMessageStore.h>
-#include <RecoveryManager.h>
-#include <TxAck.h>
-#include <qpid_test_plugin.h>
+#include "../broker/NullMessageStore.h"
+#include "../broker/RecoveryManager.h"
+#include "../broker/TxAck.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
 #include <vector>

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=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp Mon Apr  2 04:40:48 2007
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <TxBuffer.h>
-#include <qpid_test_plugin.h>
+#include "../broker/TxBuffer.h"
+#include "qpid_test_plugin.h"
 #include <iostream>
 #include <vector>
 



Mime
View raw message