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 2006/10/16 15:50:36 UTC

svn commit: r464494 [2/3] - in /incubator/qpid/trunk/qpid/cpp: ./ broker/ client/ common/ etc/ etc/stylesheets/ qpidd/ src/ src/qpid/ src/qpid/broker/ src/qpid/client/ src/qpid/concurrent/ src/qpid/framing/ src/qpid/io/ test/client/ test/unit/ test/uni...

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/TopicExchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/TopicExchange.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/TopicExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "TopicExchange.h"
-#include "ExchangeBinding.h"
+#include "./qpid/broker/TopicExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
 #include <algorithm>
 
 using namespace qpid::broker;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/TopicExchange.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/TopicExchange.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/TopicExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Mon Oct 16 06:50:26 2006
@@ -20,11 +20,11 @@
 
 #include <tr1/unordered_map>
 #include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Channel.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/Channel.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/Channel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp Mon Oct 16 06:50:26 2006
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "Channel.h"
-#include "MonitorImpl.h"
-#include "ThreadFactoryImpl.h"
-#include "Message.h"
-#include "QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/concurrent/ThreadFactoryImpl.h"
+#include "qpid/client/Message.h"
+#include "qpid/QpidError.h"
 
 using namespace std::tr1;//to use dynamic_pointer_cast
 using namespace qpid::client;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Channel.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/Channel.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h Mon Oct 16 06:50:26 2006
@@ -23,18 +23,18 @@
 #ifndef _Channel_
 #define _Channel_
 
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 
-#include "ThreadFactory.h"
+#include "qpid/concurrent/ThreadFactory.h"
 
-#include "Connection.h"
-#include "Exchange.h"
-#include "IncomingMessage.h"
-#include "Message.h"
-#include "MessageListener.h"
-#include "Queue.h"
-#include "ResponseHandler.h"
-#include "ReturnedMessageHandler.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/IncomingMessage.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include "qpid/client/ResponseHandler.h"
+#include "qpid/client/ReturnedMessageHandler.h"
 
 namespace qpid {
 namespace client {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Connection.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/Connection.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Mon Oct 16 06:50:26 2006
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "Connection.h"
-#include "Channel.h"
-#include "ConnectorImpl.h"
-#include "Message.h"
-#include "QpidError.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Channel.h"
+#include "qpid/io/ConnectorImpl.h"
+#include "qpid/client/Message.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::client;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Connection.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/Connection.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Mon Oct 16 06:50:26 2006
@@ -21,18 +21,18 @@
 #ifndef _Connection_
 #define _Connection_
 
-#include "QpidError.h"
-#include "Connector.h"
-#include "ShutdownHandler.h"
-#include "TimeoutHandler.h"
+#include "qpid/QpidError.h"
+#include "qpid/io/Connector.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/io/TimeoutHandler.h"
 
-#include "amqp_framing.h"
-#include "Exchange.h"
-#include "IncomingMessage.h"
-#include "Message.h"
-#include "MessageListener.h"
-#include "Queue.h"
-#include "ResponseHandler.h"
+#include "qpid/framing/amqp_framing.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/IncomingMessage.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include "qpid/client/ResponseHandler.h"
 
 namespace qpid {
 namespace client {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Exchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/Exchange.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/Exchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Exchange.h"
+#include "qpid/client/Exchange.h"
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/IncomingMessage.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/IncomingMessage.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/IncomingMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "IncomingMessage.h"
-#include "QpidError.h"
+#include "qpid/client/IncomingMessage.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::client;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/IncomingMessage.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/IncomingMessage.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/IncomingMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h Mon Oct 16 06:50:26 2006
@@ -17,12 +17,12 @@
  */
 #include <string>
 #include <vector>
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 
 #ifndef _IncomingMessage_
 #define _IncomingMessage_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Message.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/Message.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/Message.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 using namespace qpid::client;
 using namespace qpid::framing;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Message.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/Message.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h Mon Oct 16 06:50:26 2006
@@ -16,7 +16,7 @@
  *
  */
 #include <string>
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 
 #ifndef _Message_
 #define _Message_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/MessageListener.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/MessageListener.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/MessageListener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
  *
  */
 
-#include "MessageListener.h"
+#include "qpid/client/MessageListener.h"
 
 qpid::client::MessageListener::~MessageListener() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/MessageListener.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/MessageListener.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/MessageListener.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Queue.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/Queue.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/Queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Queue.h"
+#include "qpid/client/Queue.h"
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true){}
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/ResponseHandler.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/ResponseHandler.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/ResponseHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "ResponseHandler.h"
-#include "MonitorImpl.h"
-#include "QpidError.h"
+#include "qpid/client/ResponseHandler.h"
+#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/QpidError.h"
 
 qpid::client::ResponseHandler::ResponseHandler() : waiting(false){
     monitor = new qpid::concurrent::MonitorImpl();

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/ResponseHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/ResponseHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/ResponseHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h Mon Oct 16 06:50:26 2006
@@ -16,8 +16,8 @@
  *
  */
 #include <string>
-#include "amqp_framing.h"
-#include "Monitor.h"
+#include "qpid/framing/amqp_framing.h"
+#include "qpid/concurrent/Monitor.h"
 
 #ifndef _ResponseHandler_
 #define _ResponseHandler_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/client/src/ReturnedMessageHandler.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/src/ReturnedMessageHandler.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/src/ReturnedMessageHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
  *
  */
 
-#include "ReturnedMessageHandler.h"
+#include "qpid/client/ReturnedMessageHandler.h"
 
 qpid::client::ReturnedMessageHandler::~ReturnedMessageHandler() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/ReturnedMessageHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/client/inc/ReturnedMessageHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/client/inc/ReturnedMessageHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 #ifndef _ReturnedMessageHandler_
 #define _ReturnedMessageHandler_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRBase.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRBase.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRBase.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.cpp Mon Oct 16 06:50:26 2006
@@ -16,8 +16,8 @@
  *
  */
 #include <iostream>
-#include "APRBase.h"
-#include "QpidError.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::concurrent;
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRMonitor.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRMonitor.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRMonitor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRMonitor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRMonitor.h"
 #include <iostream>
 
 qpid::concurrent::APRMonitor::APRMonitor(){

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRMonitor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRMonitor.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRMonitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 
 #include "apr_thread_mutex.h"
 #include "apr_thread_cond.h"
-#include "Monitor.h"
+#include "qpid/concurrent/Monitor.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThread.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThread.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRThread.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRThread.h"
 #include "apr_portable.h"
 
 using namespace qpid::concurrent;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThread.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThread.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThread.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h Mon Oct 16 06:50:26 2006
@@ -19,9 +19,9 @@
 #define _APRThread_
 
 #include "apr_thread_proc.h"
-#include "APRThread.h"
-#include "Runnable.h"
-#include "Thread.h"
+#include "qpid/concurrent/APRThread.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/concurrent/Thread.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadFactory.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadFactory.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadFactory.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRThreadFactory.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRThreadFactory.h"
 
 using namespace qpid::concurrent;
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadFactory.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadFactory.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h Mon Oct 16 06:50:26 2006
@@ -20,10 +20,10 @@
 
 #include "apr_thread_proc.h"
 
-#include "APRThread.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "Runnable.h"
+#include "qpid/concurrent/APRThread.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadPool.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadPool.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadPool.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "APRThreadFactory.h"
-#include "APRThreadPool.h"
-#include "QpidError.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/concurrent/APRThreadPool.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::concurrent;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadPool.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadPool.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadPool.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.h Mon Oct 16 06:50:26 2006
@@ -20,11 +20,11 @@
 
 #include <queue>
 #include <vector>
-#include "APRMonitor.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "ThreadPool.h"
-#include "Runnable.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/concurrent/ThreadPool.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LMonitor.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LMonitor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LMonitor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LMonitor.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LMonitor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LMonitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LMonitor.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 
 /* Native Linux Monitor - Based of Kernel patch 19/20 */
 
-#include "Monitor.h"
+#include "qpid/concurrent/Monitor.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LockedQueue.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LockedQueue.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LockedQueue.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LockedQueue.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LockedQueue.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LockedQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LockedQueue.h Mon Oct 16 06:50:26 2006
@@ -19,7 +19,7 @@
 #define _LockedQueue_
 
 #include <queue>
-#include "Monitor.h"
+#include "qpid/concurrent/Monitor.h"
 
 /**
  * A threadsafe queue abstraction

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Monitor.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/Monitor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Monitor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/Monitor.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Monitor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/Monitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Monitor.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
 #ifndef _Monitor_
 #define _Monitor_
 
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/MonitorImpl.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/MonitorImpl.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/MonitorImpl.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/MonitorImpl.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/MonitorImpl.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/MonitorImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/MonitorImpl.h Mon Oct 16 06:50:26 2006
@@ -21,9 +21,9 @@
 #define _MonitorImpl_
 
 #ifdef _USE_APR_IO_
-#include "APRMonitor.h"
+#include "qpid/concurrent/APRMonitor.h"
 #else /* use POSIX Monitor */
-#include "LMonitor.h"  
+#include "qpid/concurrent/LMonitor.h"  
 #endif
 
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Runnable.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/Runnable.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Runnable.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/src/Runnable.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Runnable.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/src/Runnable.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Runnable.cpp Mon Oct 16 06:50:26 2006
@@ -15,5 +15,5 @@
  *
  */
 
-#include "Runnable.h"
+#include "qpid/concurrent/Runnable.h"
 qpid::concurrent::Runnable::~Runnable() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/TaskQueue.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/TaskQueue.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/TaskQueue.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/TaskQueue.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/TaskQueue.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/TaskQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/TaskQueue.h Mon Oct 16 06:50:26 2006
@@ -21,9 +21,9 @@
 #include <iostream>
 #include <memory>
 #include <queue>
-#include "LockedQueue.h"
-#include "Runnable.h"
-#include "ThreadPool.h"
+#include "qpid/concurrent/LockedQueue.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/concurrent/ThreadPool.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactory.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactory.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactory.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactory.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactory.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactory.h Mon Oct 16 06:50:26 2006
@@ -18,8 +18,8 @@
 #ifndef _ThreadFactory_
 #define _ThreadFactory_
 
-#include "Thread.h"
-#include "Runnable.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactoryImpl.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactoryImpl.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactoryImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h Mon Oct 16 06:50:26 2006
@@ -20,9 +20,9 @@
 
 
 #ifdef _USE_APR_IO_
-#include "APRThreadFactory.h"
+#include "qpid/concurrent/APRThreadFactory.h"
 #else
-#include "LThreadFactory.h"
+#include "qpid/concurrent/LThreadFactory.h"
 #endif
 
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadPool.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadPool.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadPool.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadPool.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadPool.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadPool.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadPool.h Mon Oct 16 06:50:26 2006
@@ -18,8 +18,8 @@
 #ifndef _ThreadPool_
 #define _ThreadPool_
 
-#include "Thread.h"
-#include "Runnable.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQBody.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQBody.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.cpp Mon Oct 16 06:50:26 2006
@@ -16,7 +16,7 @@
  *
  */
 
-#include "AMQBody.h"
+#include "qpid/framing/AMQBody.h"
 #include <iostream>
 
 std::ostream& qpid::framing::operator<<(std::ostream& out, const qpid::framing::AMQBody& body) 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQBody.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQBody.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "memory.h"
-#include "amqp_types.h"
-#include "Buffer.h"
+#include "./memory.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQBody_
 #define _AMQBody_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQContentBody.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQContentBody.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQContentBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "AMQContentBody.h"
+#include "qpid/framing/AMQContentBody.h"
 #include <iostream>
 
 qpid::framing::AMQContentBody::AMQContentBody(){

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQContentBody.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQContentBody.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQContentBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQContentBody_
 #define _AMQContentBody_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQDataBlock.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQDataBlock.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQDataBlock.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQDataBlock.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQDataBlock.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQDataBlock.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQDataBlock.h Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQDataBlock_
 #define _AMQDataBlock_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQFrame.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQFrame.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQFrame.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp Mon Oct 16 06:50:26 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#include "AMQFrame.h"
-#include "QpidError.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::framing;
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQFrame.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQFrame.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQFrame.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h Mon Oct 16 06:50:26 2006
@@ -15,15 +15,15 @@
  * limitations under the License.
  *
  */
-#include "amqp_methods.h"
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "AMQDataBlock.h"
-#include "AMQMethodBody.h"
-#include "AMQHeaderBody.h"
-#include "AMQContentBody.h"
-#include "AMQHeartbeatBody.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_methods.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/AMQDataBlock.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQFrame_
 #define _AMQFrame_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeaderBody.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeaderBody.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeaderBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "AMQHeaderBody.h"
-#include "QpidError.h"
-#include "BasicHeaderProperties.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 
 qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
     createProperties(classId);

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeaderBody.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeaderBody.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeaderBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
-#include "HeaderProperties.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/HeaderProperties.h"
 
 #ifndef _AMQHeaderBody_
 #define _AMQHeaderBody_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeartbeatBody.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeartbeatBody.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeartbeatBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp Mon Oct 16 06:50:26 2006
@@ -16,7 +16,7 @@
  *
  */
 
-#include "AMQHeartbeatBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
 #include <iostream>
 
 qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeartbeatBody.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeartbeatBody.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeartbeatBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQHeartbeatBody_
 #define _AMQHeartbeatBody_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQMethodBody.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQMethodBody.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQMethodBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "AMQMethodBody.h"
-#include "QpidError.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/QpidError.h"
 
 void qpid::framing::AMQMethodBody::encode(Buffer& buffer) const{
     buffer.putShort(amqpClassId());

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQMethodBody.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQMethodBody.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQMethodBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h Mon Oct 16 06:50:26 2006
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
-#include "AMQP_ServerOperations.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
 
 #ifndef _AMQMethodBody_
 #define _AMQMethodBody_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/BasicHeaderProperties.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/BasicHeaderProperties.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/BasicHeaderProperties.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "BasicHeaderProperties.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 
 //TODO: This could be easily generated from the spec
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/BasicHeaderProperties.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/BasicHeaderProperties.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/BasicHeaderProperties.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "amqp_methods.h"
-#include "Buffer.h"
-#include "HeaderProperties.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/amqp_methods.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/HeaderProperties.h"
 
 #ifndef _BasicHeaderProperties_
 #define _BasicHeaderProperties_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/BodyHandler.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/BodyHandler.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/BodyHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "memory.h"
-#include "BodyHandler.h"
+#include "./memory.h"
+#include "qpid/framing/BodyHandler.h"
 
 using namespace qpid::framing;
 using namespace std::tr1;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/BodyHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/BodyHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/BodyHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.h Mon Oct 16 06:50:26 2006
@@ -20,10 +20,10 @@
 #ifndef _BodyHandler_
 #define _BodyHandler_
 
-#include "AMQMethodBody.h"
-#include "AMQHeaderBody.h"
-#include "AMQContentBody.h"
-#include "AMQHeartbeatBody.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
 
 namespace qpid {
 namespace framing {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/Buffer.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/Buffer.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/Buffer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "Buffer.h"
-#include "FieldTable.h" 
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h" 
 
 qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), position(0), limit(_size){
     data = new char[size];

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/Buffer.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/Buffer.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/Buffer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 #ifndef _Buffer_
 #define _Buffer_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/FieldTable.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/FieldTable.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/FieldTable.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "FieldTable.h"
-#include "QpidError.h"
-#include "Buffer.h"
-#include "Value.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/Value.h"
 #include <assert.h>
 
 namespace qpid {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/FieldTable.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/FieldTable.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/FieldTable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h Mon Oct 16 06:50:26 2006
@@ -19,7 +19,7 @@
 #include <vector>
 #include <tr1/memory>
 #include <tr1/unordered_map>
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 #ifndef _FieldTable_
 #define _FieldTable_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/HeaderProperties.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/HeaderProperties.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/HeaderProperties.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _HeaderProperties_
 #define _HeaderProperties_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/InitiationHandler.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/InitiationHandler.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/InitiationHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
  *
  */
 
-#include "InitiationHandler.h"
+#include "qpid/framing/InitiationHandler.h"
 
 qpid::framing::InitiationHandler::~InitiationHandler() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/InitiationHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/InitiationHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/InitiationHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 #ifndef _InitiationHandler_
 #define _InitiationHandler_
 
-#include "ProtocolInitiation.h"
+#include "qpid/framing/ProtocolInitiation.h"
 
 namespace qpid {
 namespace framing {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/InputHandler.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/InputHandler.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/InputHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
  *
  */
 
-#include "InputHandler.h"
+#include "qpid/framing/InputHandler.h"
 
 qpid::framing::InputHandler::~InputHandler() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/InputHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/InputHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/InputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 #ifndef _InputHandler_
 #define _InputHandler_
 
-#include "AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace framing {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/OutputHandler.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/OutputHandler.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/OutputHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
  *
  */
 
-#include "OutputHandler.h"
+#include "qpid/framing/OutputHandler.h"
 
 qpid::framing::OutputHandler::~OutputHandler() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/OutputHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/OutputHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/OutputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
 #ifndef _OutputHandler_
 #define _OutputHandler_
 
-#include "AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace framing {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/ProtocolInitiation.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/ProtocolInitiation.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/ProtocolInitiation.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "ProtocolInitiation.h"
+#include "qpid/framing/ProtocolInitiation.h"
 
 qpid::framing::ProtocolInitiation::ProtocolInitiation(){}
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/ProtocolInitiation.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/ProtocolInitiation.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/ProtocolInitiation.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "Buffer.h"
-#include "AMQDataBlock.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/AMQDataBlock.h"
 
 #ifndef _ProtocolInitiation_
 #define _ProtocolInitiation_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/Value.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/src/Value.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/src/Value.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "Value.h"
-#include "Buffer.h"
-#include "FieldTable.h"
-#include "QpidError.h"
+#include "qpid/framing/Value.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace framing {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/Value.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/Value.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/Value.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.h Mon Oct 16 06:50:26 2006
@@ -17,8 +17,8 @@
  */
 #include <iostream>
 #include <vector>
-#include "amqp_types.h"
-#include "FieldTable.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/FieldTable.h"
 
 #ifndef _Value_
 #define _Value_

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/amqp_framing.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/inc/amqp_framing.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/inc/amqp_framing.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h Mon Oct 16 06:50:26 2006
@@ -15,17 +15,17 @@
  * limitations 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_methods.h"
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "BasicHeaderProperties.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/BodyHandler.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
+#include "qpid/framing/amqp_methods.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/framing/BasicHeaderProperties.h"

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/APRConnector.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/APRConnector.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/APRConnector.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.cpp Mon Oct 16 06:50:26 2006
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "APRBase.h"
-#include "APRConnector.h"
-#include "APRThreadFactory.h"
-#include "QpidError.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/io/APRConnector.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::io;
 using namespace qpid::concurrent;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/APRConnector.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/APRConnector.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/APRConnector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h Mon Oct 16 06:50:26 2006
@@ -21,15 +21,15 @@
 #include "apr_network_io.h"
 #include "apr_time.h"
 
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "ShutdownHandler.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "Connector.h"
-#include "APRMonitor.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/io/Connector.h"
+#include "qpid/concurrent/APRMonitor.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/APRSocket.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/APRSocket.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/APRSocket.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRSocket.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/io/APRSocket.h"
 #include <assert.h>
 #include <iostream>
 

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/APRSocket.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/APRSocket.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/APRSocket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h Mon Oct 16 06:50:26 2006
@@ -19,7 +19,7 @@
 #define _APRSocket_
 
 #include "apr_network_io.h"
-#include "Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/Acceptor.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/Acceptor.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/Acceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
  *
  */
 
-#include "Acceptor.h"
+#include "qpid/io/Acceptor.h"
 
 qpid::io::Acceptor::~Acceptor() {}

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.h (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/Acceptor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/Acceptor.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/Acceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
 #ifndef _Acceptor_
 #define _Acceptor_
 
-#include "SessionHandlerFactory.h"
+#include "qpid/io/SessionHandlerFactory.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRAcceptor.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRAcceptor.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp Mon Oct 16 06:50:26 2006
@@ -16,9 +16,9 @@
  *
  */
 #include <iostream>
-#include "BlockingAPRAcceptor.h"
-#include "APRBase.h"
-#include "APRThreadFactory.h"
+#include "qpid/io/BlockingAPRAcceptor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRThreadFactory.h"
 
 using namespace qpid::concurrent;
 using namespace qpid::framing;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRAcceptor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRAcceptor.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRAcceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h Mon Oct 16 06:50:26 2006
@@ -23,15 +23,15 @@
 #include "apr_poll.h"
 #include "apr_time.h"
 
-#include "Acceptor.h"
-#include "APRMonitor.h"
-#include "BlockingAPRSessionContext.h"
-#include "Runnable.h"
-#include "SessionContext.h"
-#include "SessionHandlerFactory.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "ThreadPool.h"
+#include "qpid/io/Acceptor.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/io/BlockingAPRSessionContext.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/concurrent/ThreadPool.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRSessionContext.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRSessionContext.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRSessionContext.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp Mon Oct 16 06:50:26 2006
@@ -17,10 +17,10 @@
  */
 #include <assert.h>
 #include <iostream>
-#include "BlockingAPRSessionContext.h"
-#include "BlockingAPRAcceptor.h"
-#include "APRBase.h"
-#include "QpidError.h"
+#include "qpid/io/BlockingAPRSessionContext.h"
+#include "qpid/io/BlockingAPRAcceptor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::concurrent;
 using namespace qpid::framing;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRSessionContext.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRSessionContext.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRSessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h Mon Oct 16 06:50:26 2006
@@ -24,16 +24,16 @@
 #include "apr_network_io.h"
 #include "apr_time.h"
 
-#include "AMQFrame.h"
-#include "APRMonitor.h"
-#include "Buffer.h"
-#include "Runnable.h"
-#include "SessionContext.h"
-#include "SessionHandler.h"
-#include "SessionHandlerFactory.h"
-#include "ShutdownHandler.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
+#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/Connector.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/Connector.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/Connector.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/Connector.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/Connector.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/Connector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/Connector.h Mon Oct 16 06:50:26 2006
@@ -18,12 +18,12 @@
 #ifndef _Connector_
 #define _Connector_
 
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "ShutdownHandler.h"
-#include "TimeoutHandler.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/io/TimeoutHandler.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/ConnectorImpl.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/ConnectorImpl.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/ConnectorImpl.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/ConnectorImpl.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/ConnectorImpl.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/ConnectorImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/ConnectorImpl.h Mon Oct 16 06:50:26 2006
@@ -19,9 +19,9 @@
 #define _APRConnectorImpl_
 
 #ifdef _USE_APR_IO_
-#include "APRConnector.h"
+#include "qpid/io/APRConnector.h"
 #else
-#include "LConnector.h"
+#include "qpid/io/LConnector.h"
 #endif
 
 namespace qpid {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LConnector.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/LConnector.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LConnector.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/LConnector.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LConnector.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/LConnector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LConnector.h Mon Oct 16 06:50:26 2006
@@ -19,13 +19,13 @@
 #define _LConnector_
 
 
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "Connector.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/io/Connector.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/LFAcceptor.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/LFAcceptor.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/LFAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "LFAcceptor.h"
-#include "APRBase.h"
+#include "qpid/io/LFAcceptor.h"
+#include "qpid/concurrent/APRBase.h"
 
 using namespace qpid::concurrent;
 using namespace qpid::io;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/LFAcceptor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/LFAcceptor.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/LFAcceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h Mon Oct 16 06:50:26 2006
@@ -23,16 +23,16 @@
 #include "apr_poll.h"
 #include "apr_time.h"
 
-#include "Acceptor.h"
-#include "APRMonitor.h"
-#include "APRThreadFactory.h"
-#include "APRThreadPool.h"
-#include "LFProcessor.h"
-#include "LFSessionContext.h"
-#include "Runnable.h"
-#include "SessionContext.h"
-#include "SessionHandlerFactory.h"
-#include "Thread.h"
+#include "qpid/io/Acceptor.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/concurrent/APRThreadPool.h"
+#include "qpid/io/LFProcessor.h"
+#include "qpid/io/LFSessionContext.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/concurrent/Thread.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/LFProcessor.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/LFProcessor.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/LFProcessor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.cpp Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "LFProcessor.h"
-#include "APRBase.h"
-#include "LFSessionContext.h"
-#include "QpidError.h"
+#include "qpid/io/LFProcessor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/io/LFSessionContext.h"
+#include "qpid/QpidError.h"
 #include <sstream>
 
 using namespace qpid::io;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h (from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/LFProcessor.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/LFProcessor.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/LFProcessor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h Mon Oct 16 06:50:26 2006
@@ -21,9 +21,9 @@
 #include "apr_poll.h"
 #include <iostream>
 #include <vector>
-#include "APRMonitor.h"
-#include "APRThreadFactory.h"
-#include "Runnable.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/LFSessionContext.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/src/LFSessionContext.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/src/LFSessionContext.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.cpp Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "LFSessionContext.h"
-#include "APRBase.h"
-#include "QpidError.h"
+#include "qpid/io/LFSessionContext.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/QpidError.h"
 #include <assert.h>
 
 using namespace qpid::concurrent;

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/LFSessionContext.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/LFSessionContext.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/LFSessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h Mon Oct 16 06:50:26 2006
@@ -24,13 +24,13 @@
 #include "apr_poll.h"
 #include "apr_time.h"
 
-#include "AMQFrame.h"
-#include "APRMonitor.h"
-#include "APRSocket.h"
-#include "Buffer.h"
-#include "LFProcessor.h"
-#include "SessionContext.h"
-#include "SessionHandler.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/io/APRSocket.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/io/LFProcessor.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionContext.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionContext.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
 #ifndef _SessionContext_
 #define _SessionContext_
 
-#include "OutputHandler.h"
+#include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandler.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandler.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h Mon Oct 16 06:50:26 2006
@@ -18,10 +18,10 @@
 #ifndef _SessionHandler_
 #define _SessionHandler_
 
-#include "InputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "TimeoutHandler.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/io/TimeoutHandler.h"
 
 namespace qpid {
 namespace io {

Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandlerFactory.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandlerFactory.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandlerFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h Mon Oct 16 06:50:26 2006
@@ -18,8 +18,8 @@
 #ifndef _SessionHandlerFactory_
 #define _SessionHandlerFactory_
 
-#include "SessionContext.h"
-#include "SessionHandler.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
 
 namespace qpid {
 namespace io {