You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/04/13 22:58:34 UTC
svn commit: r528668 [1/2] - in /incubator/qpid/trunk/qpid/cpp: ./
gentools/templ.cpp/ src/ src/broker/ src/client/ src/framing/ src/qpid/
src/qpid/broker/ src/qpid/client/ src/qpid/framing/ src/qpid/sys/
src/qpid/sys/apr/ src/qpid/sys/posix/ src/sys/ s...
Author: aconway
Date: Fri Apr 13 13:58:27 2007
New Revision: 528668
URL: http://svn.apache.org/viewvc?view=rev&rev=528668
Log:
Moved src/ source code to src/qpid directory:
- allows rhm package to build consistently against checked-out or installed qpid.
- consistent correspondence between source paths and C++ namespaces.
- consistent use of #include <qpid/foo> in source and by users.
- allows header files to split over multiple directories,
e.g. separating generated code, separating public API from private files.
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/
incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/Exception.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.h
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/Exception.h
incubator/qpid/trunk/qpid/cpp/src/qpid/ExceptionHolder.cpp
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/ExceptionHolder.h
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h
incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/QpidError.h
incubator/qpid/trunk/qpid/cpp/src/qpid/SharedObject.h
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/SharedObject.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/
- copied from r528642, incubator/qpid/trunk/qpid/cpp/src/broker/
incubator/qpid/trunk/qpid/cpp/src/qpid/client/
- copied from r528642, incubator/qpid/trunk/qpid/cpp/src/client/
incubator/qpid/trunk/qpid/cpp/src/qpid/doxygen_mainpage.h
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/doxygen_mainpage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/
- copied from r528642, incubator/qpid/trunk/qpid/cpp/src/framing/
incubator/qpid/trunk/qpid/cpp/src/qpid/shared_ptr.h
- copied unchanged from r528642, incubator/qpid/trunk/qpid/cpp/src/shared_ptr.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/
- copied from r528642, incubator/qpid/trunk/qpid/cpp/src/sys/
Removed:
incubator/qpid/trunk/qpid/cpp/src/Exception.cpp
incubator/qpid/trunk/qpid/cpp/src/Exception.h
incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.cpp
incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h
incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp
incubator/qpid/trunk/qpid/cpp/src/QpidError.h
incubator/qpid/trunk/qpid/cpp/src/SharedObject.h
incubator/qpid/trunk/qpid/cpp/src/broker/
incubator/qpid/trunk/qpid/cpp/src/client/
incubator/qpid/trunk/qpid/cpp/src/doxygen_mainpage.h
incubator/qpid/trunk/qpid/cpp/src/framing/
incubator/qpid/trunk/qpid/cpp/src/shared_ptr.h
incubator/qpid/trunk/qpid/cpp/src/sys/
Modified:
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Content.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/InMemoryContent.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/LazyLoadedContent.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Persistable.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Reference.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/BasicMessageChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageChannel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MethodBodyInstances.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQResponseBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FramingContent.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Requester.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Responder.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ThreadSafeQueue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/LFSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Socket.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/apr/Thread.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelConnection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/EventChannelThreads.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/check.h
incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h
incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h
incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ValueTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
Modified: incubator/qpid/trunk/qpid/cpp/README
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Fri Apr 13 13:58:27 2007
@@ -5,14 +5,17 @@
The Qpid project also provides Java, Ruby and Python implementations.
+NOTE: This release of Qpid C++ implements the AMQP 0-9 WIP.
+It will not inter-operate with AMQP 0-8 implementations.
+We will be moving to 0-10 as soon as it is available.
+
For additional software or information on the Qpid project go to:
http://cwiki.apache.org/qpid/
-
Available documentation:
qpidd(1) man page - how to run the broker daemon.
html/index.html - C++ client API.
-
+ NEWS - release notes.
Note the daemon and client API can be installed separately.
This README describes how to build the Qpid C++ broker and client, either
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl Fri Apr 13 13:58:27 2007
@@ -31,7 +31,7 @@
#include <sstream>
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/ProtocolVersion.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl Fri Apr 13 13:58:27 2007
@@ -27,8 +27,8 @@
*/
#include <sstream>
#include "AMQP_ClientProxy.h"
-#include "../framing/ChannelAdapter.h"
-#include "../framing/amqp_types_full.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/amqp_types_full.h"
%{MLIST} ${cpc_method_body_include}
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl Fri Apr 13 13:58:27 2007
@@ -29,7 +29,7 @@
#ifndef qpid_framing_AMQP_ClientProxy__
#define qpid_framing_AMQP_ClientProxy__
-#include "../framing/Proxy.h"
+#include "qpid/framing/Proxy.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl Fri Apr 13 13:58:27 2007
@@ -28,7 +28,7 @@
#ifndef qpid_framing_highestProtocolVersion__
#define qpid_framing_highestProtocolVersion__
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/ProtocolVersion.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl Fri Apr 13 13:58:27 2007
@@ -27,7 +27,7 @@
*/
#include <sstream>
-#include "../framing/ProtocolVersionException.h"
+#include "qpid/framing/ProtocolVersionException.h"
#include "AMQP_MethodVersionMap.h"
namespace qpid
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl Fri Apr 13 13:58:27 2007
@@ -30,7 +30,7 @@
#define qpid_framing_AMQP_MethodVersionMap__
#include <map>
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
%{MLIST} ${mc_method_body_include}
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl Fri Apr 13 13:58:27 2007
@@ -29,7 +29,7 @@
#ifndef qpid_framing_AMQP_ServerOperations__
#define qpid_framing_AMQP_ServerOperations__
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/ProtocolVersion.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl Fri Apr 13 13:58:27 2007
@@ -28,8 +28,8 @@
#include <sstream>
#include "AMQP_ServerProxy.h"
-#include "../framing/ChannelAdapter.h"
-#include "../framing/amqp_types_full.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/amqp_types_full.h"
%{MLIST} ${spc_method_body_include}
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl Fri Apr 13 13:58:27 2007
@@ -29,7 +29,7 @@
#ifndef qpid_framing_AMQP_ServerProxy__
#define qpid_framing_AMQP_ServerProxy__
-#include "../framing/Proxy.h"
+#include "qpid/framing/Proxy.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl Fri Apr 13 13:58:27 2007
@@ -32,11 +32,11 @@
#include <string>
#include <sstream>
-#include "../framing/amqp_types.h"
-#include "../framing/${mb_base_class}.h"
-#include "../framing/Buffer.h"
-#include "../framing/FieldTable.h"
-#include "../framing/FramingContent.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/${mb_base_class}.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/FramingContent.h"
namespace qpid
{
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Fri Apr 13 13:58:27 2007
@@ -6,8 +6,16 @@
AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS)
+gen = gen/qpid/framing
+framing= qpid/framing
+broker = qpid/broker
+client = qpid/client
+apr = qpid/sys/apr
+posix = qpid/sys/posix
+
+
# -I top_builddir for config.h
-INCLUDES = -I$(top_builddir) -I$(srcdir)
+INCLUDES = -I$(top_builddir) -I$(srcdir)/qpid -Igen
qpidd_LDADD = \
libqpidbroker.la \
@@ -16,7 +24,6 @@
sbin_PROGRAMS = qpidd
qpidd_SOURCES = qpidd.cpp
-apr = sys/apr
apr_src = \
$(apr)/APRAcceptor.cpp \
$(apr)/APRBase.cpp \
@@ -34,7 +41,6 @@
$(apr)/LFProcessor.h \
$(apr)/LFSessionContext.h
-posix = sys/posix
posix_src = \
$(posix)/PosixAcceptor.cpp \
$(posix)/Socket.cpp \
@@ -52,11 +58,6 @@
platform_src = $(apr_src)
platform_hdr = $(apr_hdr)
-framing = framing
-gen = gen
-broker = broker
-client = client
-
lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
libqpidcommon_la_LIBADD = \
@@ -98,13 +99,14 @@
$(gen)/AMQP_HighestVersion.h \
$(gen)/AMQP_MethodVersionMap.cpp \
$(gen)/AMQP_ServerProxy.cpp \
- Exception.cpp \
- ExceptionHolder.cpp \
- QpidError.cpp \
- sys/Runnable.cpp \
- sys/Time.cpp \
- sys/ProducerConsumer.cpp
+ qpid/Exception.cpp \
+ qpid/ExceptionHolder.cpp \
+ qpid/QpidError.cpp \
+ qpid/sys/Runnable.cpp \
+ qpid/sys/Time.cpp \
+ qpid/sys/ProducerConsumer.cpp
+libqpidbroker_la_LIBADD = libqpidcommon.la
libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
libqpidbroker_la_SOURCES = \
$(broker)/AccumulatedAck.cpp \
@@ -260,29 +262,29 @@
$(framing)/amqp_framing.h \
$(framing)/amqp_types.h \
$(framing)/amqp_types_full.h \
- sys/Acceptor.h \
- sys/AtomicCount.h \
- sys/Condition.h \
- sys/ConnectionInputHandler.h \
- sys/ConnectionInputHandlerFactory.h \
- sys/ConnectionOutputHandler.h \
- sys/Module.h \
- sys/Monitor.h \
- sys/Mutex.h \
- sys/ProducerConsumer.h \
- sys/Runnable.h \
- sys/ScopedIncrement.h \
- sys/ShutdownHandler.h \
- sys/Socket.h \
- sys/Thread.h \
- sys/ThreadSafeQueue.h \
- sys/Time.h \
- sys/TimeoutHandler.h \
- Exception.h \
- ExceptionHolder.h \
- QpidError.h \
- SharedObject.h \
- shared_ptr.h
+ qpid/sys/Acceptor.h \
+ qpid/sys/AtomicCount.h \
+ qpid/sys/Condition.h \
+ qpid/sys/ConnectionInputHandler.h \
+ qpid/sys/ConnectionInputHandlerFactory.h \
+ qpid/sys/ConnectionOutputHandler.h \
+ qpid/sys/Module.h \
+ qpid/sys/Monitor.h \
+ qpid/sys/Mutex.h \
+ qpid/sys/ProducerConsumer.h \
+ qpid/sys/Runnable.h \
+ qpid/sys/ScopedIncrement.h \
+ qpid/sys/ShutdownHandler.h \
+ qpid/sys/Socket.h \
+ qpid/sys/Thread.h \
+ qpid/sys/ThreadSafeQueue.h \
+ qpid/sys/Time.h \
+ qpid/sys/TimeoutHandler.h \
+ qpid/Exception.h \
+ qpid/ExceptionHolder.h \
+ qpid/QpidError.h \
+ qpid/SharedObject.h \
+ qpid/shared_ptr.h
# Distribute the generated sources, at least for now, since
# the generator code is in java.
@@ -299,22 +301,23 @@
spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
-$(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
- rm -f $(BUILT_SOURCES)
+$(BUILT_SOURCES) $(gen): $(spec) $(java_sources) $(cxx_templates) Makefile.am
+ rm -rf $(gen)
+ mkdir -p $(gen)
cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
-c -o $(gen) -t $(gentools_dir)/templ.cpp $(spec)
- touch $(gen)/timestamp
+ touch $(gen)
-$(gen)/gen-src.mk: $(gen)/timestamp
- mkdir -p $(gen)
- ./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
+gen/gen-src.mk: $(gen)
+ ./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) $(gen) > $@-t
mv $@-t $@
+
endif
maintainer-clean:
rm -f $(gentools_srcdir)/*.class
- rm -f $(BUILT_SOURCES)
+ rm -f $(gen)
# Force build during dist phase so help2man will work.
dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS)
Modified: incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh?view=diff&rev=528668&r1=528667&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh (original)
+++ incubator/qpid/trunk/qpid/cpp/src/make-gen-src-mk.sh Fri Apr 13 13:58:27 2007
@@ -4,13 +4,14 @@
gentools_dir=$1
gentools_srcdir=$2
+gen=$3
wildcard() { echo `ls $* 2>/dev/null` ; }
cat <<EOF
-generated_sources = `wildcard gen/*.cpp`
+generated_sources = `wildcard $gen/*.cpp`
-generated_headers = `wildcard gen/*.h`
+generated_headers = `wildcard $gen/*.h`
if CAN_GENERATE_CODE
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
*
*/
#include "AutoDelete.h"
-#include "../sys/Time.h"
+#include "qpid/sys/Time.h"
using namespace qpid::broker;
using namespace qpid::sys;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h Fri Apr 13 13:58:27 2007
@@ -22,10 +22,10 @@
*/
#include <iostream>
#include <queue>
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "BrokerQueue.h"
#include "QueueRegistry.h"
-#include "../sys/Thread.h"
+#include "qpid/sys/Thread.h"
namespace qpid {
namespace broker{
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri Apr 13 13:58:27 2007
@@ -21,19 +21,19 @@
#include <iostream>
#include <memory>
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
#include "DirectExchange.h"
#include "TopicExchange.h"
#include "FanOutExchange.h"
#include "HeadersExchange.h"
#include "MessageStoreModule.h"
#include "NullMessageStore.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/framing/ProtocolInitiation.h"
#include "RecoveryManagerImpl.h"
#include "Connection.h"
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/ConnectionInputHandlerFactory.h"
-#include "../sys/TimeoutHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/TimeoutHandler.h"
#include "Broker.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Fri Apr 13 13:58:27 2007
@@ -24,16 +24,16 @@
#include "Configuration.h"
#include "ConnectionFactory.h"
-#include "../sys/Runnable.h"
-#include "../sys/Acceptor.h"
-#include "../SharedObject.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/SharedObject.h"
#include "MessageStore.h"
#include "AutoDelete.h"
#include "ExchangeRegistry.h"
#include "ConnectionToken.h"
#include "DirectExchange.h"
-#include "../framing/OutputHandler.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
#include "QueueRegistry.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp Fri Apr 13 13:58:27 2007
@@ -20,8 +20,8 @@
#include "BrokerAdapter.h"
#include "BrokerChannel.h"
#include "Connection.h"
-#include "../framing/AMQMethodBody.h"
-#include "../Exception.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/Exception.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.h Fri Apr 13 13:58:27 2007
@@ -18,10 +18,10 @@
* limitations under the License.
*
*/
-#include "../gen/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
#include "HandlerImpl.h"
#include "MessageHandlerImpl.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp Fri Apr 13 13:58:27 2007
@@ -28,8 +28,8 @@
#include <boost/bind.hpp>
#include "BrokerChannel.h"
-#include "../framing/ChannelAdapter.h"
-#include "../QpidError.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/QpidError.h"
#include "DeliverableMessage.h"
#include "BrokerQueue.h"
#include "BrokerMessage.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.h Fri Apr 13 13:58:27 2007
@@ -35,8 +35,8 @@
#include "NameGenerator.h"
#include "Prefetch.h"
#include "TxBuffer.h"
-#include "../framing/ChannelAdapter.h"
-#include "../gen/ChannelOpenBody.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/ChannelOpenBody.h"
#include "CompletionHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerExchange.h Fri Apr 13 13:58:27 2007
@@ -25,7 +25,7 @@
#include <boost/shared_ptr.hpp>
#include "Deliverable.h"
#include "BrokerQueue.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.cpp Fri Apr 13 13:58:27 2007
@@ -26,13 +26,13 @@
#include "InMemoryContent.h"
#include "LazyLoadedContent.h"
#include "MessageStore.h"
-#include "../gen/BasicDeliverBody.h"
-#include "../gen/BasicGetOkBody.h"
-#include "../framing/AMQContentBody.h"
-#include "../framing/AMQHeaderBody.h"
-#include "../framing/AMQMethodBody.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/BasicDeliverBody.h"
+#include "qpid/framing/BasicGetOkBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/ChannelAdapter.h"
#include "RecoveryManagerImpl.h"
using namespace boost;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessage.h Fri Apr 13 13:58:27 2007
@@ -26,10 +26,10 @@
#include <boost/shared_ptr.hpp>
#include "BrokerMessageBase.h"
-#include "../framing/BasicHeaderProperties.h"
+#include "qpid/framing/BasicHeaderProperties.h"
#include "ConnectionToken.h"
#include "Content.h"
-#include "../sys/Mutex.h"
+#include "qpid/sys/Mutex.h"
#include "TxBuffer.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageBase.h Fri Apr 13 13:58:27 2007
@@ -26,7 +26,7 @@
#include <boost/shared_ptr.hpp>
#include "Content.h"
#include "PersistableMessage.h"
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.cpp Fri Apr 13 13:58:27 2007
@@ -18,17 +18,17 @@
* under the License.
*
*/
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "BrokerMessageMessage.h"
-#include "../framing/ChannelAdapter.h"
-#include "../gen/MessageTransferBody.h"
-#include "../gen/MessageOpenBody.h"
-#include "../gen/MessageCloseBody.h"
-#include "../gen/MessageAppendBody.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/MessageOpenBody.h"
+#include "qpid/framing/MessageCloseBody.h"
+#include "qpid/framing/MessageAppendBody.h"
#include "Reference.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/FieldTable.h"
-#include "../framing/BasicHeaderProperties.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/BasicHeaderProperties.h"
#include "RecoveryManagerImpl.h"
#include <algorithm>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerMessageMessage.h Fri Apr 13 13:58:27 2007
@@ -22,8 +22,8 @@
*
*/
#include "BrokerMessageBase.h"
-#include "../gen/MessageTransferBody.h"
-#include "../framing/amqp_types.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/amqp_types.h"
#include <boost/weak_ptr.hpp>
#include <vector>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp Fri Apr 13 13:58:27 2007
@@ -23,8 +23,8 @@
#include "BrokerQueue.h"
#include "MessageStore.h"
-#include "../sys/Monitor.h"
-#include "../sys/Time.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Time.h"
#include <iostream>
#include "QueueRegistry.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.h Fri Apr 13 13:58:27 2007
@@ -25,12 +25,12 @@
#include <memory>
#include <queue>
#include <boost/shared_ptr.hpp>
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
#include "ConnectionToken.h"
#include "Consumer.h"
#include "BrokerMessage.h"
-#include "../framing/FieldTable.h"
-#include "../sys/Monitor.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/sys/Monitor.h"
#include "PersistableQueue.h"
#include "QueuePolicy.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h Fri Apr 13 13:58:27 2007
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <iostream>
#include <vector>
-#include "../Exception.h"
+#include "qpid/Exception.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Fri Apr 13 13:58:27 2007
@@ -23,7 +23,7 @@
#include "Connection.h"
#include "BrokerChannel.h"
-#include "../gen/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
#include "BrokerAdapter.h"
using namespace boost;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h Fri Apr 13 13:58:27 2007
@@ -26,15 +26,15 @@
#include <boost/ptr_container/ptr_map.hpp>
-#include "../framing/AMQFrame.h"
-#include "../gen/AMQP_ServerOperations.h"
-#include "../gen/AMQP_ClientProxy.h"
-#include "../sys/ConnectionOutputHandler.h"
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/TimeoutHandler.h"
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/framing/ProtocolVersion.h"
#include "Broker.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
#include "BrokerChannel.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
#ifndef _ConnectionFactory_
#define _ConnectionFactory_
-#include "../sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Content.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Content.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Content.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Content.h Fri Apr 13 13:58:27 2007
@@ -23,9 +23,9 @@
#include <boost/function.hpp>
-#include "../framing/AMQContentBody.h"
-#include "../framing/Buffer.h"
-#include "../framing/OutputHandler.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/OutputHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h Fri Apr 13 13:58:27 2007
@@ -24,9 +24,9 @@
#include <map>
#include <vector>
#include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
#include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "BrokerQueue.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Fri Apr 13 13:58:27 2007
@@ -24,7 +24,7 @@
#include <map>
#include "BrokerExchange.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h Fri Apr 13 13:58:27 2007
@@ -24,9 +24,9 @@
#include <map>
#include <vector>
#include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
#include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "BrokerQueue.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HandlerImpl.h Fri Apr 13 13:58:27 2007
@@ -20,7 +20,7 @@
*/
#include "BrokerChannel.h"
-#include "../gen/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
*
*/
#include "HeadersExchange.h"
-#include "../framing/Value.h"
-#include "../QpidError.h"
+#include "qpid/framing/Value.h"
+#include "qpid/QpidError.h"
#include <algorithm>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h Fri Apr 13 13:58:27 2007
@@ -23,9 +23,9 @@
#include <vector>
#include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
#include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "BrokerQueue.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/InMemoryContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/InMemoryContent.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/InMemoryContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/InMemoryContent.cpp Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
*
*/
#include "InMemoryContent.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/ChannelAdapter.h"
using namespace qpid::broker;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/LazyLoadedContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/LazyLoadedContent.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/LazyLoadedContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/LazyLoadedContent.cpp Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
*
*/
#include "LazyLoadedContent.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/ChannelAdapter.h"
using namespace qpid::broker;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h Fri Apr 13 13:58:27 2007
@@ -22,13 +22,13 @@
#define _MessageBuilder_
#include <memory>
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "BrokerExchange.h"
#include "BrokerMessage.h"
#include "MessageStore.h"
-#include "../framing/AMQContentBody.h"
-#include "../framing/AMQHeaderBody.h"
-#include "../gen/BasicPublishBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/BasicPublishBody.h"
#include "CompletionHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.cpp Fri Apr 13 13:58:27 2007
@@ -16,15 +16,15 @@
*
*/
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "MessageHandlerImpl.h"
#include "BrokerChannel.h"
-#include "../framing/FramingContent.h"
+#include "qpid/framing/FramingContent.h"
#include "Connection.h"
#include "Broker.h"
#include "BrokerMessageMessage.h"
-#include "../gen/MessageAppendBody.h"
-#include "../gen/MessageTransferBody.h"
+#include "qpid/framing/MessageAppendBody.h"
+#include "qpid/framing/MessageTransferBody.h"
#include "BrokerAdapter.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageHandlerImpl.h Fri Apr 13 13:58:27 2007
@@ -21,8 +21,8 @@
#include <memory>
-#include "../gen/AMQP_ServerOperations.h"
-#include "../gen/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
#include "Reference.h"
#include "HandlerImpl.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStoreModule.h Fri Apr 13 13:58:27 2007
@@ -25,7 +25,7 @@
#include "MessageStore.h"
#include "BrokerQueue.h"
#include "RecoveryManager.h"
-#include "../sys/Module.h"
+#include "qpid/sys/Module.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Persistable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Persistable.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Persistable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Persistable.h Fri Apr 13 13:58:27 2007
@@ -22,8 +22,8 @@
*
*/
-#include "../framing/amqp_types.h"
-#include "../framing/Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h Fri Apr 13 13:58:27 2007
@@ -25,7 +25,7 @@
#include <string>
#include <boost/shared_ptr.hpp>
#include "Persistable.h"
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
#ifndef _Prefetch_
#define _Prefetch_
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
#ifndef _QueuePolicy_
#define _QueuePolicy_
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
#define _QueueRegistry_
#include <map>
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "BrokerQueue.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessage.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessage.h Fri Apr 13 13:58:27 2007
@@ -23,8 +23,8 @@
*/
#include <boost/shared_ptr.hpp>
-#include "../framing/amqp_types.h"
-#include "../framing/Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManager.h Fri Apr 13 13:58:27 2007
@@ -23,7 +23,7 @@
#include "RecoverableQueue.h"
#include "RecoverableMessage.h"
-#include "../framing/Buffer.h"
+#include "qpid/framing/Buffer.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Reference.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Reference.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Reference.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Reference.cpp Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
#include <boost/bind.hpp>
#include "Reference.h"
#include "BrokerMessageMessage.h"
-#include "../QpidError.h"
-#include "../gen/MessageAppendBody.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/MessageAppendBody.h"
#include "CompletionHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Fri Apr 13 13:58:27 2007
@@ -24,9 +24,9 @@
#include <map>
#include <vector>
#include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
#include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "BrokerQueue.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/BasicMessageChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/BasicMessageChannel.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/BasicMessageChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/BasicMessageChannel.cpp Fri Apr 13 13:58:27 2007
@@ -16,11 +16,11 @@
*
*/
#include "BasicMessageChannel.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
#include "ClientChannel.h"
#include "ReturnedMessageHandler.h"
#include "MessageListener.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
#include "Connection.h"
#include <queue>
#include <iostream>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.cpp Fri Apr 13 13:58:27 2007
@@ -15,11 +15,11 @@
* limitations under the License.
*
*/
-#include "../gen/AMQP_ClientOperations.h"
+#include "qpid/framing/AMQP_ClientOperations.h"
#include "ClientAdapter.h"
#include "Connection.h"
-#include "../Exception.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/Exception.h"
+#include "qpid/framing/AMQMethodBody.h"
namespace qpid {
namespace client {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientAdapter.h Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
*
*/
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/ChannelAdapter.h"
#include "ClientChannel.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.cpp Fri Apr 13 13:58:27 2007
@@ -20,9 +20,9 @@
*/
#include <iostream>
#include "ClientChannel.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include "ClientMessage.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "MethodBodyInstances.h"
#include "Connection.h"
#include "BasicMessageChannel.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientChannel.h Fri Apr 13 13:58:27 2007
@@ -22,13 +22,13 @@
*
*/
#include <boost/scoped_ptr.hpp>
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
#include "ClientExchange.h"
#include "ClientMessage.h"
#include "ClientQueue.h"
#include "ResponseHandler.h"
-#include "../framing/ChannelAdapter.h"
-#include "../sys/Thread.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/sys/Thread.h"
#include "AckMode.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientConnection.cpp Fri Apr 13 13:58:27 2007
@@ -25,7 +25,7 @@
#include "Connection.h"
#include "ClientChannel.h"
#include "ClientMessage.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include <iostream>
#include <sstream>
#include "MethodBodyInstances.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ClientMessage.h Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
*
*/
#include <string>
-#include "../framing/BasicHeaderProperties.h"
+#include "qpid/framing/BasicHeaderProperties.h"
namespace qpid {
namespace client {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Fri Apr 13 13:58:27 2007
@@ -23,11 +23,11 @@
*/
#include <map>
#include <string>
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "ClientChannel.h"
#include "Connector.h"
-#include "../sys/ShutdownHandler.h"
-#include "../sys/TimeoutHandler.h"
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
*
*/
#include <iostream>
-#include "../QpidError.h"
-#include "../sys/Time.h"
+#include "qpid/QpidError.h"
+#include "qpid/sys/Time.h"
#include "Connector.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h Fri Apr 13 13:58:27 2007
@@ -22,16 +22,16 @@
#define _Connector_
-#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"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/framing/ProtocolVersion.h"
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Socket.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp Fri Apr 13 13:58:27 2007
@@ -20,7 +20,7 @@
*/
#include "IncomingMessage.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
#include "ClientMessage.h"
#include <boost/format.hpp>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
* under the License.
*
*/
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include <map>
#include <queue>
#include <vector>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageChannel.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageChannel.h Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
*
*/
-#include "../shared_ptr.h"
-#include "../sys/Runnable.h"
+#include "qpid/shared_ptr.h"
+#include "qpid/sys/Runnable.h"
#include "AckMode.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.cpp Fri Apr 13 13:58:27 2007
@@ -18,13 +18,13 @@
#include <iostream>
#include <boost/format.hpp>
#include "MessageMessageChannel.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
#include "ClientChannel.h"
#include "ReturnedMessageHandler.h"
#include "MessageListener.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
#include "Connection.h"
-#include "../shared_ptr.h"
+#include "qpid/shared_ptr.h"
#include <boost/bind.hpp>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageMessageChannel.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
#include "MessageChannel.h"
#include "IncomingMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
#include <boost/ptr_container/ptr_map.hpp>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/MethodBodyInstances.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/MethodBodyInstances.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/MethodBodyInstances.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/MethodBodyInstances.h Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
#ifndef _MethodBodyInstances_h_
#define _MethodBodyInstances_h_
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp Fri Apr 13 13:58:27 2007
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include <boost/format.hpp>
#include "ResponseHandler.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
using namespace qpid::sys;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h Fri Apr 13 13:58:27 2007
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "../shared_ptr.h"
-#include "../sys/Monitor.h"
+#include "qpid/shared_ptr.h"
+#include "qpid/sys/Monitor.h"
#ifndef _ResponseHandler_
#define _ResponseHandler_
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
#include <boost/format.hpp>
#include "AMQFrame.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "AMQRequestBody.h"
#include "AMQResponseBody.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h Fri Apr 13 13:58:27 2007
@@ -30,8 +30,8 @@
#include "AMQHeaderBody.h"
#include "AMQContentBody.h"
#include "AMQHeartbeatBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
-#include "../gen/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
#include "Buffer.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
*
*/
#include "AMQHeaderBody.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "BasicHeaderProperties.h"
qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp Fri Apr 13 13:58:27 2007
@@ -20,8 +20,8 @@
*/
#include "AMQFrame.h"
#include "AMQMethodBody.h"
-#include "../QpidError.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h Fri Apr 13 13:58:27 2007
@@ -25,7 +25,7 @@
#include "amqp_types.h"
#include "AMQBody.h"
#include "Buffer.h"
-#include "../gen/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
#include "MethodContext.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.cpp Fri Apr 13 13:58:27 2007
@@ -17,7 +17,7 @@
*/
#include "AMQRequestBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQRequestBody.h Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
*
*/
-#include "AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQResponseBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQResponseBody.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQResponseBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQResponseBody.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
#include "AMQFrame.h"
#include "AMQResponseBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "BodyHandler.h"
#include "AMQRequestBody.h"
#include "AMQResponseBody.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
#include "ChannelAdapter.h"
#include "AMQFrame.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
using boost::format;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ChannelAdapter.h Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
*
*/
-#include "../shared_ptr.h"
+#include "qpid/shared_ptr.h"
#include "BodyHandler.h"
#include "Requester.h"
#include "Responder.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Correlator.h Fri Apr 13 13:58:27 2007
@@ -19,8 +19,8 @@
*
*/
-#include "../shared_ptr.h"
-#include "../framing/AMQResponseBody.h"
+#include "qpid/shared_ptr.h"
+#include "qpid/framing/AMQResponseBody.h"
#include <boost/function.hpp>
#include <map>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
*
*/
#include "FieldTable.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "Buffer.h"
#include "Value.h"
#include <assert.h>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FramingContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FramingContent.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FramingContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FramingContent.cpp Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
#include "Buffer.h"
#include "FramingContent.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include <sstream>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.h Fri Apr 13 13:58:27 2007
@@ -22,7 +22,7 @@
#ifndef _ProtocolVersionException_
#define _ProtocolVersionException_
-#include "../Exception.h"
+#include "qpid/Exception.h"
#include "ProtocolVersion.h"
#include <string>
#include <vector>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Requester.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Requester.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Requester.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Requester.cpp Fri Apr 13 13:58:27 2007
@@ -19,7 +19,7 @@
#include <boost/format.hpp>
#include "Requester.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Responder.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Responder.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Responder.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Responder.cpp Fri Apr 13 13:58:27 2007
@@ -18,7 +18,7 @@
#include <boost/format.hpp>
#include "Responder.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
#include "Value.h"
#include "Buffer.h"
#include "FieldTable.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include <sstream>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h Fri Apr 13 13:58:27 2007
@@ -26,7 +26,7 @@
#include "AMQHeaderBody.h"
#include "AMQContentBody.h"
#include "AMQHeartbeatBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
#include "InputHandler.h"
#include "OutputHandler.h"
#include "InitiationHandler.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h Fri Apr 13 13:58:27 2007
@@ -23,7 +23,7 @@
*/
#include <stdint.h>
-#include "../SharedObject.h"
+#include "qpid/SharedObject.h"
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h Fri Apr 13 13:58:27 2007
@@ -21,9 +21,9 @@
#ifndef _ConnectionInputHandler_
#define _ConnectionInputHandler_
-#include "../framing/InputHandler.h"
-#include "../framing/InitiationHandler.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
#include "TimeoutHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h Fri Apr 13 13:58:27 2007
@@ -21,7 +21,7 @@
#ifndef _ConnectionOutputHandler_
#define _ConnectionOutputHandler_
-#include "../framing/OutputHandler.h"
+#include "qpid/framing/OutputHandler.h"
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h Fri Apr 13 13:58:27 2007
@@ -23,7 +23,7 @@
*/
#include <boost/noncopyable.hpp>
#include <iostream>
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.cpp?view=diff&rev=528668&r1=528642&r2=528668
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/ProducerConsumer.cpp Fri Apr 13 13:58:27 2007
@@ -17,7 +17,7 @@
*/
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
#include "ScopedIncrement.h"
#include "ProducerConsumer.h"