summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2007-04-02 11:40:48 +0000
committerAndrew Stitcher <astitcher@apache.org>2007-04-02 11:40:48 +0000
commit16e203a0d32df9829bcf4fb738ef89fc94404155 (patch)
treeb5dbb15f4a238ca377236ce16140443e20ed3e4a
parentfb410c63d08e87019b3d2a8d85820ae809758f62 (diff)
downloadqpid-python-16e203a0d32df9829bcf4fb738ef89fc94404155.tar.gz
Fix for the most disruptive items in QPID-243.
* All #include lines now use '""' rather than '<>' where appropriate. * #include lines within the qpid project use relative includes so that the same path will work in /usr/include when installed as part of the client libraries. * All the source code has now been rearranged to be under src in a directory analogous to the namespace of the classes in it. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@524769 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/Makefile.am2
-rwxr-xr-xcpp/bootstrap4
-rw-r--r--cpp/configure.ac12
-rw-r--r--cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl4
-rw-r--r--cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl4
-rw-r--r--cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl2
-rw-r--r--cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl10
-rw-r--r--cpp/lib/Makefile.am1
-rw-r--r--cpp/lib/common/Makefile.am143
-rw-r--r--cpp/src/Exception.cpp (renamed from cpp/lib/common/Exception.cpp)2
-rw-r--r--cpp/src/Exception.h (renamed from cpp/lib/common/Exception.h)2
-rw-r--r--cpp/src/ExceptionHolder.cpp (renamed from cpp/lib/common/ExceptionHolder.cpp)0
-rw-r--r--cpp/src/ExceptionHolder.h (renamed from cpp/lib/common/ExceptionHolder.h)2
-rw-r--r--cpp/src/Makefile.am155
-rw-r--r--cpp/src/QpidError.cpp (renamed from cpp/lib/common/QpidError.cpp)2
-rw-r--r--cpp/src/QpidError.h (renamed from cpp/lib/common/QpidError.h)2
-rw-r--r--cpp/src/SharedObject.h (renamed from cpp/lib/common/SharedObject.h)0
-rw-r--r--cpp/src/broker/AccumulatedAck.cpp (renamed from cpp/lib/broker/AccumulatedAck.cpp)0
-rw-r--r--cpp/src/broker/AccumulatedAck.h (renamed from cpp/lib/broker/AccumulatedAck.h)0
-rw-r--r--cpp/src/broker/AutoDelete.cpp (renamed from cpp/lib/broker/AutoDelete.cpp)4
-rw-r--r--cpp/src/broker/AutoDelete.h (renamed from cpp/lib/broker/AutoDelete.h)8
-rw-r--r--cpp/src/broker/Broker.cpp (renamed from cpp/lib/broker/Broker.cpp)10
-rw-r--r--cpp/src/broker/Broker.h (renamed from cpp/lib/broker/Broker.h)26
-rw-r--r--cpp/src/broker/BrokerAdapter.cpp (renamed from cpp/lib/broker/BrokerAdapter.cpp)4
-rw-r--r--cpp/src/broker/BrokerAdapter.h (renamed from cpp/lib/broker/BrokerAdapter.h)2
-rw-r--r--cpp/src/broker/BrokerChannel.cpp (renamed from cpp/lib/broker/BrokerChannel.cpp)16
-rw-r--r--cpp/src/broker/BrokerChannel.h (renamed from cpp/lib/broker/BrokerChannel.h)16
-rw-r--r--cpp/src/broker/BrokerExchange.h (renamed from cpp/lib/broker/BrokerExchange.h)6
-rw-r--r--cpp/src/broker/BrokerMessage.cpp (renamed from cpp/lib/broker/BrokerMessage.cpp)22
-rw-r--r--cpp/src/broker/BrokerMessage.h (renamed from cpp/lib/broker/BrokerMessage.h)12
-rw-r--r--cpp/src/broker/BrokerMessageBase.h (renamed from cpp/lib/broker/BrokerMessageBase.h)2
-rw-r--r--cpp/src/broker/BrokerMessageMessage.cpp (renamed from cpp/lib/broker/BrokerMessageMessage.cpp)10
-rw-r--r--cpp/src/broker/BrokerMessageMessage.h (renamed from cpp/lib/broker/BrokerMessageMessage.h)2
-rw-r--r--cpp/src/broker/BrokerQueue.cpp (renamed from cpp/lib/broker/BrokerQueue.cpp)8
-rw-r--r--cpp/src/broker/BrokerQueue.h (renamed from cpp/lib/broker/BrokerQueue.h)14
-rw-r--r--cpp/src/broker/BrokerSingleton.cpp (renamed from cpp/lib/broker/BrokerSingleton.cpp)0
-rw-r--r--cpp/src/broker/BrokerSingleton.h (renamed from cpp/lib/broker/BrokerSingleton.h)0
-rw-r--r--cpp/src/broker/CompletionHandler.h (renamed from cpp/lib/broker/CompletionHandler.h)0
-rw-r--r--cpp/src/broker/Configuration.cpp (renamed from cpp/lib/broker/Configuration.cpp)4
-rw-r--r--cpp/src/broker/Configuration.h (renamed from cpp/lib/broker/Configuration.h)2
-rw-r--r--cpp/src/broker/Connection.cpp (renamed from cpp/lib/broker/Connection.cpp)0
-rw-r--r--cpp/src/broker/Connection.h (renamed from cpp/lib/broker/Connection.h)16
-rw-r--r--cpp/src/broker/ConnectionFactory.cpp (renamed from cpp/lib/broker/ConnectionFactory.cpp)2
-rw-r--r--cpp/src/broker/ConnectionFactory.h (renamed from cpp/lib/broker/ConnectionFactory.h)2
-rw-r--r--cpp/src/broker/ConnectionToken.h (renamed from cpp/lib/broker/ConnectionToken.h)0
-rw-r--r--cpp/src/broker/Consumer.h (renamed from cpp/lib/broker/Consumer.h)2
-rw-r--r--cpp/src/broker/Content.h (renamed from cpp/lib/broker/Content.h)6
-rw-r--r--cpp/src/broker/DeletingTxOp.cpp (renamed from cpp/lib/broker/DeletingTxOp.cpp)2
-rw-r--r--cpp/src/broker/DeletingTxOp.h (renamed from cpp/lib/broker/DeletingTxOp.h)2
-rw-r--r--cpp/src/broker/Deliverable.h (renamed from cpp/lib/broker/Deliverable.h)2
-rw-r--r--cpp/src/broker/DeliverableMessage.cpp (renamed from cpp/lib/broker/DeliverableMessage.cpp)2
-rw-r--r--cpp/src/broker/DeliverableMessage.h (renamed from cpp/lib/broker/DeliverableMessage.h)6
-rw-r--r--cpp/src/broker/DeliveryRecord.cpp (renamed from cpp/lib/broker/DeliveryRecord.cpp)4
-rw-r--r--cpp/src/broker/DeliveryRecord.h (renamed from cpp/lib/broker/DeliveryRecord.h)8
-rw-r--r--cpp/src/broker/DirectExchange.cpp (renamed from cpp/lib/broker/DirectExchange.cpp)2
-rw-r--r--cpp/src/broker/DirectExchange.h (renamed from cpp/lib/broker/DirectExchange.h)10
-rw-r--r--cpp/src/broker/ExchangeRegistry.cpp (renamed from cpp/lib/broker/ExchangeRegistry.cpp)10
-rw-r--r--cpp/src/broker/ExchangeRegistry.h (renamed from cpp/lib/broker/ExchangeRegistry.h)4
-rw-r--r--cpp/src/broker/FanOutExchange.cpp (renamed from cpp/lib/broker/FanOutExchange.cpp)2
-rw-r--r--cpp/src/broker/FanOutExchange.h (renamed from cpp/lib/broker/FanOutExchange.h)10
-rw-r--r--cpp/src/broker/HandlerImpl.h (renamed from cpp/lib/broker/HandlerImpl.h)0
-rw-r--r--cpp/src/broker/HeadersExchange.cpp (renamed from cpp/lib/broker/HeadersExchange.cpp)6
-rw-r--r--cpp/src/broker/HeadersExchange.h (renamed from cpp/lib/broker/HeadersExchange.h)10
-rw-r--r--cpp/src/broker/InMemoryContent.cpp (renamed from cpp/lib/broker/InMemoryContent.cpp)6
-rw-r--r--cpp/src/broker/InMemoryContent.h (renamed from cpp/lib/broker/InMemoryContent.h)2
-rw-r--r--cpp/src/broker/LazyLoadedContent.cpp (renamed from cpp/lib/broker/LazyLoadedContent.cpp)6
-rw-r--r--cpp/src/broker/LazyLoadedContent.h (renamed from cpp/lib/broker/LazyLoadedContent.h)4
-rw-r--r--cpp/src/broker/Makefile.am (renamed from cpp/lib/broker/Makefile.am)6
-rw-r--r--cpp/src/broker/MessageBuilder.cpp (renamed from cpp/lib/broker/MessageBuilder.cpp)6
-rw-r--r--cpp/src/broker/MessageBuilder.h (renamed from cpp/lib/broker/MessageBuilder.h)14
-rw-r--r--cpp/src/broker/MessageHandlerImpl.cpp (renamed from cpp/lib/broker/MessageHandlerImpl.cpp)4
-rw-r--r--cpp/src/broker/MessageHandlerImpl.h (renamed from cpp/lib/broker/MessageHandlerImpl.h)0
-rw-r--r--cpp/src/broker/MessageStore.h (renamed from cpp/lib/broker/MessageStore.h)0
-rw-r--r--cpp/src/broker/MessageStoreModule.cpp (renamed from cpp/lib/broker/MessageStoreModule.cpp)2
-rw-r--r--cpp/src/broker/MessageStoreModule.h (renamed from cpp/lib/broker/MessageStoreModule.h)10
-rw-r--r--cpp/src/broker/NameGenerator.cpp (renamed from cpp/lib/broker/NameGenerator.cpp)2
-rw-r--r--cpp/src/broker/NameGenerator.h (renamed from cpp/lib/broker/NameGenerator.h)2
-rw-r--r--cpp/src/broker/NullMessageStore.cpp (renamed from cpp/lib/broker/NullMessageStore.cpp)4
-rw-r--r--cpp/src/broker/NullMessageStore.h (renamed from cpp/lib/broker/NullMessageStore.h)6
-rw-r--r--cpp/src/broker/Persistable.h (renamed from cpp/lib/broker/Persistable.h)4
-rw-r--r--cpp/src/broker/PersistableExchange.h (renamed from cpp/lib/broker/PersistableExchange.h)0
-rw-r--r--cpp/src/broker/PersistableMessage.h (renamed from cpp/lib/broker/PersistableMessage.h)2
-rw-r--r--cpp/src/broker/PersistableQueue.h (renamed from cpp/lib/broker/PersistableQueue.h)0
-rw-r--r--cpp/src/broker/Prefetch.h (renamed from cpp/lib/broker/Prefetch.h)2
-rw-r--r--cpp/src/broker/QueuePolicy.cpp (renamed from cpp/lib/broker/QueuePolicy.cpp)2
-rw-r--r--cpp/src/broker/QueuePolicy.h (renamed from cpp/lib/broker/QueuePolicy.h)2
-rw-r--r--cpp/src/broker/QueueRegistry.cpp (renamed from cpp/lib/broker/QueueRegistry.cpp)2
-rw-r--r--cpp/src/broker/QueueRegistry.h (renamed from cpp/lib/broker/QueueRegistry.h)4
-rw-r--r--cpp/src/broker/RecoverableMessage.h (renamed from cpp/lib/broker/RecoverableMessage.h)4
-rw-r--r--cpp/src/broker/RecoverableQueue.h (renamed from cpp/lib/broker/RecoverableQueue.h)0
-rw-r--r--cpp/src/broker/RecoveryManager.h (renamed from cpp/lib/broker/RecoveryManager.h)2
-rw-r--r--cpp/src/broker/RecoveryManagerImpl.cpp (renamed from cpp/lib/broker/RecoveryManagerImpl.cpp)2
-rw-r--r--cpp/src/broker/RecoveryManagerImpl.h (renamed from cpp/lib/broker/RecoveryManagerImpl.h)0
-rw-r--r--cpp/src/broker/Reference.cpp (renamed from cpp/lib/broker/Reference.cpp)2
-rw-r--r--cpp/src/broker/Reference.h (renamed from cpp/lib/broker/Reference.h)0
-rw-r--r--cpp/src/broker/TopicExchange.cpp (renamed from cpp/lib/broker/TopicExchange.cpp)2
-rw-r--r--cpp/src/broker/TopicExchange.h (renamed from cpp/lib/broker/TopicExchange.h)10
-rw-r--r--cpp/src/broker/TransactionalStore.h (renamed from cpp/lib/broker/TransactionalStore.h)0
-rw-r--r--cpp/src/broker/TxAck.cpp (renamed from cpp/lib/broker/TxAck.cpp)2
-rw-r--r--cpp/src/broker/TxAck.h (renamed from cpp/lib/broker/TxAck.h)6
-rw-r--r--cpp/src/broker/TxBuffer.cpp (renamed from cpp/lib/broker/TxBuffer.cpp)2
-rw-r--r--cpp/src/broker/TxBuffer.h (renamed from cpp/lib/broker/TxBuffer.h)4
-rw-r--r--cpp/src/broker/TxOp.h (renamed from cpp/lib/broker/TxOp.h)2
-rw-r--r--cpp/src/broker/TxPublish.cpp (renamed from cpp/lib/broker/TxPublish.cpp)2
-rw-r--r--cpp/src/broker/TxPublish.h (renamed from cpp/lib/broker/TxPublish.h)10
-rw-r--r--cpp/src/client/AckMode.h (renamed from cpp/lib/client/AckMode.h)0
-rw-r--r--cpp/src/client/BasicMessageChannel.cpp (renamed from cpp/lib/client/BasicMessageChannel.cpp)4
-rw-r--r--cpp/src/client/BasicMessageChannel.h (renamed from cpp/lib/client/BasicMessageChannel.h)0
-rw-r--r--cpp/src/client/ClientAdapter.cpp (renamed from cpp/lib/client/ClientAdapter.cpp)4
-rw-r--r--cpp/src/client/ClientAdapter.h (renamed from cpp/lib/client/ClientAdapter.h)2
-rw-r--r--cpp/src/client/ClientChannel.cpp (renamed from cpp/lib/client/ClientChannel.cpp)10
-rw-r--r--cpp/src/client/ClientChannel.h (renamed from cpp/lib/client/ClientChannel.h)14
-rw-r--r--cpp/src/client/ClientExchange.cpp (renamed from cpp/lib/client/ClientExchange.cpp)2
-rw-r--r--cpp/src/client/ClientExchange.h (renamed from cpp/lib/client/ClientExchange.h)0
-rw-r--r--cpp/src/client/ClientMessage.h (renamed from cpp/lib/client/ClientMessage.h)2
-rw-r--r--cpp/src/client/ClientQueue.cpp (renamed from cpp/lib/client/ClientQueue.cpp)2
-rw-r--r--cpp/src/client/ClientQueue.h (renamed from cpp/lib/client/ClientQueue.h)0
-rw-r--r--cpp/src/client/Connection.cpp (renamed from cpp/lib/client/Connection.cpp)10
-rw-r--r--cpp/src/client/Connection.h (renamed from cpp/lib/client/Connection.h)6
-rw-r--r--cpp/src/client/Connector.cpp (renamed from cpp/lib/client/Connector.cpp)4
-rw-r--r--cpp/src/client/Connector.h (renamed from cpp/lib/client/Connector.h)20
-rw-r--r--cpp/src/client/IncomingMessage.cpp (renamed from cpp/lib/client/IncomingMessage.cpp)2
-rw-r--r--cpp/src/client/IncomingMessage.h (renamed from cpp/lib/client/IncomingMessage.h)2
-rw-r--r--cpp/src/client/Makefile.am (renamed from cpp/lib/client/Makefile.am)7
-rw-r--r--cpp/src/client/MessageChannel.h (renamed from cpp/lib/client/MessageChannel.h)4
-rw-r--r--cpp/src/client/MessageListener.cpp (renamed from cpp/lib/client/MessageListener.cpp)2
-rw-r--r--cpp/src/client/MessageListener.h (renamed from cpp/lib/client/MessageListener.h)2
-rw-r--r--cpp/src/client/MethodBodyInstances.h (renamed from cpp/lib/client/MethodBodyInstances.h)2
-rw-r--r--cpp/src/client/ResponseHandler.cpp (renamed from cpp/lib/client/ResponseHandler.cpp)4
-rw-r--r--cpp/src/client/ResponseHandler.h (renamed from cpp/lib/client/ResponseHandler.h)4
-rw-r--r--cpp/src/client/ReturnedMessageHandler.cpp (renamed from cpp/lib/client/ReturnedMessageHandler.cpp)2
-rw-r--r--cpp/src/client/ReturnedMessageHandler.h (renamed from cpp/lib/client/ReturnedMessageHandler.h)2
-rw-r--r--cpp/src/doxygen_mainpage.h (renamed from cpp/lib/common/doxygen_mainpage.h)0
-rw-r--r--cpp/src/framing/AMQBody.cpp (renamed from cpp/lib/common/framing/AMQBody.cpp)2
-rw-r--r--cpp/src/framing/AMQBody.h (renamed from cpp/lib/common/framing/AMQBody.h)4
-rw-r--r--cpp/src/framing/AMQContentBody.cpp (renamed from cpp/lib/common/framing/AMQContentBody.cpp)2
-rw-r--r--cpp/src/framing/AMQContentBody.h (renamed from cpp/lib/common/framing/AMQContentBody.h)6
-rw-r--r--cpp/src/framing/AMQDataBlock.h (renamed from cpp/lib/common/framing/AMQDataBlock.h)2
-rw-r--r--cpp/src/framing/AMQFrame.cpp (renamed from cpp/lib/common/framing/AMQFrame.cpp)4
-rw-r--r--cpp/src/framing/AMQFrame.h (renamed from cpp/lib/common/framing/AMQFrame.h)20
-rw-r--r--cpp/src/framing/AMQHeaderBody.cpp (renamed from cpp/lib/common/framing/AMQHeaderBody.cpp)6
-rw-r--r--cpp/src/framing/AMQHeaderBody.h (renamed from cpp/lib/common/framing/AMQHeaderBody.h)8
-rw-r--r--cpp/src/framing/AMQHeartbeatBody.cpp (renamed from cpp/lib/common/framing/AMQHeartbeatBody.cpp)2
-rw-r--r--cpp/src/framing/AMQHeartbeatBody.h (renamed from cpp/lib/common/framing/AMQHeartbeatBody.h)6
-rw-r--r--cpp/src/framing/AMQMethodBody.cpp (renamed from cpp/lib/common/framing/AMQMethodBody.cpp)6
-rw-r--r--cpp/src/framing/AMQMethodBody.h (renamed from cpp/lib/common/framing/AMQMethodBody.h)10
-rw-r--r--cpp/src/framing/AMQRequestBody.cpp (renamed from cpp/lib/common/framing/AMQRequestBody.cpp)0
-rw-r--r--cpp/src/framing/AMQRequestBody.h (renamed from cpp/lib/common/framing/AMQRequestBody.h)0
-rw-r--r--cpp/src/framing/AMQResponseBody.cpp (renamed from cpp/lib/common/framing/AMQResponseBody.cpp)0
-rw-r--r--cpp/src/framing/AMQResponseBody.h (renamed from cpp/lib/common/framing/AMQResponseBody.h)0
-rw-r--r--cpp/src/framing/BasicHeaderProperties.cpp (renamed from cpp/lib/common/framing/BasicHeaderProperties.cpp)2
-rw-r--r--cpp/src/framing/BasicHeaderProperties.h (renamed from cpp/lib/common/framing/BasicHeaderProperties.h)8
-rw-r--r--cpp/src/framing/BodyHandler.cpp (renamed from cpp/lib/common/framing/BodyHandler.cpp)14
-rw-r--r--cpp/src/framing/BodyHandler.h (renamed from cpp/lib/common/framing/BodyHandler.h)0
-rw-r--r--cpp/src/framing/Buffer.cpp (renamed from cpp/lib/common/framing/Buffer.cpp)6
-rw-r--r--cpp/src/framing/Buffer.h (renamed from cpp/lib/common/framing/Buffer.h)2
-rw-r--r--cpp/src/framing/ChannelAdapter.cpp (renamed from cpp/lib/common/framing/ChannelAdapter.cpp)2
-rw-r--r--cpp/src/framing/ChannelAdapter.h (renamed from cpp/lib/common/framing/ChannelAdapter.h)2
-rw-r--r--cpp/src/framing/FieldTable.cpp (renamed from cpp/lib/common/framing/FieldTable.cpp)8
-rw-r--r--cpp/src/framing/FieldTable.h (renamed from cpp/lib/common/framing/FieldTable.h)2
-rw-r--r--cpp/src/framing/FramingContent.cpp (renamed from cpp/lib/common/framing/FramingContent.cpp)2
-rw-r--r--cpp/src/framing/FramingContent.h (renamed from cpp/lib/common/framing/FramingContent.h)0
-rw-r--r--cpp/src/framing/HeaderProperties.h (renamed from cpp/lib/common/framing/HeaderProperties.h)4
-rw-r--r--cpp/src/framing/InitiationHandler.cpp (renamed from cpp/lib/common/framing/InitiationHandler.cpp)2
-rw-r--r--cpp/src/framing/InitiationHandler.h (renamed from cpp/lib/common/framing/InitiationHandler.h)2
-rw-r--r--cpp/src/framing/InputHandler.h (renamed from cpp/lib/common/framing/InputHandler.h)2
-rw-r--r--cpp/src/framing/MethodContext.cpp (renamed from cpp/lib/common/framing/MethodContext.cpp)0
-rw-r--r--cpp/src/framing/MethodContext.h (renamed from cpp/lib/common/framing/MethodContext.h)0
-rw-r--r--cpp/src/framing/OutputHandler.h (renamed from cpp/lib/common/framing/OutputHandler.h)0
-rw-r--r--cpp/src/framing/ProtocolInitiation.cpp (renamed from cpp/lib/common/framing/ProtocolInitiation.cpp)2
-rw-r--r--cpp/src/framing/ProtocolInitiation.h (renamed from cpp/lib/common/framing/ProtocolInitiation.h)8
-rw-r--r--cpp/src/framing/ProtocolVersion.cpp (renamed from cpp/lib/common/framing/ProtocolVersion.cpp)2
-rw-r--r--cpp/src/framing/ProtocolVersion.h (renamed from cpp/lib/common/framing/ProtocolVersion.h)2
-rw-r--r--cpp/src/framing/ProtocolVersionException.cpp (renamed from cpp/lib/common/framing/ProtocolVersionException.cpp)2
-rw-r--r--cpp/src/framing/ProtocolVersionException.h (renamed from cpp/lib/common/framing/ProtocolVersionException.h)4
-rw-r--r--cpp/src/framing/Proxy.cpp (renamed from cpp/lib/common/framing/Proxy.cpp)0
-rw-r--r--cpp/src/framing/Proxy.h (renamed from cpp/lib/common/framing/Proxy.h)0
-rw-r--r--cpp/src/framing/Requester.cpp (renamed from cpp/lib/common/framing/Requester.cpp)2
-rw-r--r--cpp/src/framing/Requester.h (renamed from cpp/lib/common/framing/Requester.h)0
-rw-r--r--cpp/src/framing/Responder.cpp (renamed from cpp/lib/common/framing/Responder.cpp)2
-rw-r--r--cpp/src/framing/Responder.h (renamed from cpp/lib/common/framing/Responder.h)0
-rw-r--r--cpp/src/framing/Value.cpp (renamed from cpp/lib/common/framing/Value.cpp)8
-rw-r--r--cpp/src/framing/Value.h (renamed from cpp/lib/common/framing/Value.h)4
-rw-r--r--cpp/src/framing/amqp_framing.h (renamed from cpp/lib/common/framing/amqp_framing.h)32
-rw-r--r--cpp/src/framing/amqp_types.h (renamed from cpp/lib/common/framing/amqp_types.h)2
-rw-r--r--cpp/src/framing/amqp_types_full.h (renamed from cpp/lib/common/framing/amqp_types_full.h)0
-rw-r--r--cpp/src/gen/Makefile.am (renamed from cpp/gen/Makefile.am)4
-rwxr-xr-xcpp/src/gen/make-gen-src-mk.sh (renamed from cpp/gen/make-gen-src-mk.sh)0
-rw-r--r--cpp/src/qpidd.cpp6
-rw-r--r--cpp/src/shared_ptr.h (renamed from cpp/lib/common/shared_ptr.h)0
-rw-r--r--cpp/src/sys/Acceptor.h (renamed from cpp/lib/common/sys/Acceptor.h)2
-rw-r--r--cpp/src/sys/AtomicCount.h (renamed from cpp/lib/common/sys/AtomicCount.h)0
-rw-r--r--cpp/src/sys/Condition.h (renamed from cpp/lib/common/sys/Condition.h)6
-rw-r--r--cpp/src/sys/ConnectionInputHandler.h (renamed from cpp/lib/common/sys/ConnectionInputHandler.h)8
-rw-r--r--cpp/src/sys/ConnectionInputHandlerFactory.h (renamed from cpp/lib/common/sys/ConnectionInputHandlerFactory.h)0
-rw-r--r--cpp/src/sys/ConnectionOutputHandler.h (renamed from cpp/lib/common/sys/ConnectionOutputHandler.h)2
-rw-r--r--cpp/src/sys/Module.h (renamed from cpp/lib/common/sys/Module.h)6
-rw-r--r--cpp/src/sys/Monitor.h (renamed from cpp/lib/common/sys/Monitor.h)4
-rw-r--r--cpp/src/sys/Mutex.h (renamed from cpp/lib/common/sys/Mutex.h)10
-rw-r--r--cpp/src/sys/ProducerConsumer.cpp (renamed from cpp/lib/common/sys/ProducerConsumer.cpp)2
-rw-r--r--cpp/src/sys/ProducerConsumer.h (renamed from cpp/lib/common/sys/ProducerConsumer.h)4
-rw-r--r--cpp/src/sys/Runnable.cpp (renamed from cpp/lib/common/sys/Runnable.cpp)0
-rw-r--r--cpp/src/sys/Runnable.h (renamed from cpp/lib/common/sys/Runnable.h)0
-rw-r--r--cpp/src/sys/ScopedIncrement.h (renamed from cpp/lib/common/sys/ScopedIncrement.h)0
-rw-r--r--cpp/src/sys/ShutdownHandler.h (renamed from cpp/lib/common/sys/ShutdownHandler.h)0
-rw-r--r--cpp/src/sys/Socket.h (renamed from cpp/lib/common/sys/Socket.h)4
-rw-r--r--cpp/src/sys/Thread.h (renamed from cpp/lib/common/sys/Thread.h)14
-rw-r--r--cpp/src/sys/ThreadSafeQueue.h (renamed from cpp/lib/common/sys/ThreadSafeQueue.h)2
-rw-r--r--cpp/src/sys/Time.cpp (renamed from cpp/lib/common/sys/Time.cpp)0
-rw-r--r--cpp/src/sys/Time.h (renamed from cpp/lib/common/sys/Time.h)4
-rw-r--r--cpp/src/sys/TimeoutHandler.h (renamed from cpp/lib/common/sys/TimeoutHandler.h)0
-rw-r--r--cpp/src/sys/apr/APRAcceptor.cpp (renamed from cpp/lib/common/sys/apr/APRAcceptor.cpp)4
-rw-r--r--cpp/src/sys/apr/APRBase.cpp (renamed from cpp/lib/common/sys/apr/APRBase.cpp)2
-rw-r--r--cpp/src/sys/apr/APRBase.h (renamed from cpp/lib/common/sys/apr/APRBase.h)2
-rw-r--r--cpp/src/sys/apr/APRPool.cpp (renamed from cpp/lib/common/sys/apr/APRPool.cpp)0
-rw-r--r--cpp/src/sys/apr/APRPool.h (renamed from cpp/lib/common/sys/apr/APRPool.h)0
-rw-r--r--cpp/src/sys/apr/APRSocket.cpp (renamed from cpp/lib/common/sys/apr/APRSocket.cpp)0
-rw-r--r--cpp/src/sys/apr/APRSocket.h (renamed from cpp/lib/common/sys/apr/APRSocket.h)2
-rw-r--r--cpp/src/sys/apr/LFProcessor.cpp (renamed from cpp/lib/common/sys/apr/LFProcessor.cpp)2
-rw-r--r--cpp/src/sys/apr/LFProcessor.h (renamed from cpp/lib/common/sys/apr/LFProcessor.h)6
-rw-r--r--cpp/src/sys/apr/LFSessionContext.cpp (renamed from cpp/lib/common/sys/apr/LFSessionContext.cpp)2
-rw-r--r--cpp/src/sys/apr/LFSessionContext.h (renamed from cpp/lib/common/sys/apr/LFSessionContext.h)10
-rw-r--r--cpp/src/sys/apr/Socket.cpp (renamed from cpp/lib/common/sys/apr/Socket.cpp)6
-rw-r--r--cpp/src/sys/apr/Thread.cpp (renamed from cpp/lib/common/sys/apr/Thread.cpp)2
-rw-r--r--cpp/src/sys/posix/EventChannel.cpp (renamed from cpp/lib/common/sys/posix/EventChannel.cpp)4
-rw-r--r--cpp/src/sys/posix/EventChannel.h (renamed from cpp/lib/common/sys/posix/EventChannel.h)4
-rw-r--r--cpp/src/sys/posix/EventChannelAcceptor.cpp (renamed from cpp/lib/common/sys/posix/EventChannelAcceptor.cpp)16
-rw-r--r--cpp/src/sys/posix/EventChannelConnection.cpp (renamed from cpp/lib/common/sys/posix/EventChannelConnection.cpp)4
-rw-r--r--cpp/src/sys/posix/EventChannelConnection.h (renamed from cpp/lib/common/sys/posix/EventChannelConnection.h)10
-rw-r--r--cpp/src/sys/posix/EventChannelThreads.cpp (renamed from cpp/lib/common/sys/posix/EventChannelThreads.cpp)2
-rw-r--r--cpp/src/sys/posix/EventChannelThreads.h (renamed from cpp/lib/common/sys/posix/EventChannelThreads.h)10
-rw-r--r--cpp/src/sys/posix/PosixAcceptor.cpp (renamed from cpp/lib/common/sys/posix/PosixAcceptor.cpp)4
-rw-r--r--cpp/src/sys/posix/Socket.cpp (renamed from cpp/lib/common/sys/posix/Socket.cpp)6
-rw-r--r--cpp/src/sys/posix/Thread.cpp (renamed from cpp/lib/common/sys/posix/Thread.cpp)2
-rw-r--r--cpp/src/sys/posix/check.cpp (renamed from cpp/lib/common/sys/posix/check.cpp)0
-rw-r--r--cpp/src/sys/posix/check.h (renamed from cpp/lib/common/sys/posix/check.h)2
-rw-r--r--cpp/src/tests/.vg-supp (renamed from cpp/tests/.vg-supp)0
-rw-r--r--cpp/src/tests/APRBaseTest.cpp (renamed from cpp/tests/APRBaseTest.cpp)4
-rw-r--r--cpp/src/tests/AccumulatedAckTest.cpp (renamed from cpp/tests/AccumulatedAckTest.cpp)4
-rw-r--r--cpp/src/tests/BrokerChannelTest.cpp (renamed from cpp/tests/BrokerChannelTest.cpp)20
-rw-r--r--cpp/src/tests/ClientChannelTest.cpp (renamed from cpp/tests/ClientChannelTest.cpp)10
-rw-r--r--cpp/src/tests/ConfigurationTest.cpp (renamed from cpp/tests/ConfigurationTest.cpp)4
-rw-r--r--cpp/src/tests/EventChannelConnectionTest.cpp (renamed from cpp/tests/EventChannelConnectionTest.cpp)12
-rw-r--r--cpp/src/tests/EventChannelTest.cpp (renamed from cpp/tests/EventChannelTest.cpp)12
-rw-r--r--cpp/src/tests/EventChannelThreadsTest.cpp (renamed from cpp/tests/EventChannelThreadsTest.cpp)6
-rw-r--r--cpp/src/tests/ExchangeTest.cpp (renamed from cpp/tests/ExchangeTest.cpp)12
-rw-r--r--cpp/src/tests/FieldTableTest.cpp (renamed from cpp/tests/FieldTableTest.cpp)4
-rw-r--r--cpp/src/tests/FramingTest.cpp (renamed from cpp/tests/FramingTest.cpp)26
-rw-r--r--cpp/src/tests/HeaderTest.cpp (renamed from cpp/tests/HeaderTest.cpp)4
-rw-r--r--cpp/src/tests/HeadersExchangeTest.cpp (renamed from cpp/tests/HeadersExchangeTest.cpp)8
-rw-r--r--cpp/src/tests/InMemoryContentTest.cpp (renamed from cpp/tests/InMemoryContentTest.cpp)8
-rw-r--r--cpp/src/tests/InProcessBroker.h (renamed from cpp/tests/InProcessBroker.h)10
-rw-r--r--cpp/src/tests/LazyLoadedContentTest.cpp (renamed from cpp/tests/LazyLoadedContentTest.cpp)10
-rw-r--r--cpp/src/tests/Makefile.am (renamed from cpp/tests/Makefile.am)14
-rw-r--r--cpp/src/tests/MessageBuilderTest.cpp (renamed from cpp/tests/MessageBuilderTest.cpp)12
-rw-r--r--cpp/src/tests/MessageHandlerTest.cpp (renamed from cpp/tests/MessageHandlerTest.cpp)6
-rw-r--r--cpp/src/tests/MessageTest.cpp (renamed from cpp/tests/MessageTest.cpp)8
-rw-r--r--cpp/src/tests/MockChannel.h (renamed from cpp/tests/MockChannel.h)8
-rw-r--r--cpp/src/tests/MockConnectionInputHandler.h (renamed from cpp/tests/MockConnectionInputHandler.h)8
-rw-r--r--cpp/src/tests/ProducerConsumerTest.cpp (renamed from cpp/tests/ProducerConsumerTest.cpp)8
-rw-r--r--cpp/src/tests/QueuePolicyTest.cpp (renamed from cpp/tests/QueuePolicyTest.cpp)4
-rw-r--r--cpp/src/tests/QueueRegistryTest.cpp (renamed from cpp/tests/QueueRegistryTest.cpp)4
-rw-r--r--cpp/src/tests/QueueTest.cpp (renamed from cpp/tests/QueueTest.cpp)6
-rw-r--r--cpp/src/tests/ReferenceTest.cpp (renamed from cpp/tests/ReferenceTest.cpp)6
-rw-r--r--cpp/src/tests/TopicExchangeTest.cpp (renamed from cpp/tests/TopicExchangeTest.cpp)4
-rw-r--r--cpp/src/tests/TxAckTest.cpp (renamed from cpp/tests/TxAckTest.cpp)8
-rw-r--r--cpp/src/tests/TxBufferTest.cpp (renamed from cpp/tests/TxBufferTest.cpp)4
-rw-r--r--cpp/src/tests/TxPublishTest.cpp (renamed from cpp/tests/TxPublishTest.cpp)8
-rw-r--r--cpp/src/tests/ValueTest.cpp (renamed from cpp/tests/ValueTest.cpp)4
-rw-r--r--cpp/src/tests/client_test.cpp (renamed from cpp/tests/client_test.cpp)14
-rw-r--r--cpp/src/tests/dlclose_noop.c (renamed from cpp/tests/dlclose_noop.c)0
-rw-r--r--cpp/src/tests/echo_service.cpp (renamed from cpp/tests/echo_service.cpp)14
-rw-r--r--cpp/src/tests/examples.Makefile (renamed from cpp/tests/examples.Makefile)0
-rw-r--r--cpp/src/tests/examples.README (renamed from cpp/tests/examples.README)0
-rwxr-xr-xcpp/src/tests/kill_broker (renamed from cpp/tests/kill_broker)0
-rwxr-xr-xcpp/src/tests/python_tests8
-rw-r--r--cpp/src/tests/qpid_test_plugin.h (renamed from cpp/tests/qpid_test_plugin.h)0
-rwxr-xr-xcpp/src/tests/quick_topictest (renamed from cpp/tests/quick_topictest)0
-rwxr-xr-xcpp/src/tests/run-python-tests (renamed from cpp/tests/run-python-tests)0
-rwxr-xr-xcpp/src/tests/run-unit-tests (renamed from cpp/tests/run-unit-tests)0
-rw-r--r--cpp/src/tests/setup (renamed from cpp/tests/setup)0
-rwxr-xr-xcpp/src/tests/start_broker (renamed from cpp/tests/start_broker)2
-rw-r--r--cpp/src/tests/topic_listener.cpp (renamed from cpp/tests/topic_listener.cpp)14
-rw-r--r--cpp/src/tests/topic_publisher.cpp (renamed from cpp/tests/topic_publisher.cpp)18
-rwxr-xr-xcpp/src/tests/topictest (renamed from cpp/tests/topictest)0
-rwxr-xr-xcpp/tests/python_tests8
292 files changed, 797 insertions, 823 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 112cd5dd59..2ae53a7181 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = \
$(PACKAGE).spec \
$(PACKAGE).spec.in
-SUBDIRS = gen lib src docs/api docs/man rpm tests
+SUBDIRS = src docs/api docs/man rpm
# Update libtool, if needed.
libtool: $(LIBTOOL_DEPS)
diff --git a/cpp/bootstrap b/cpp/bootstrap
index 4fbce77e3f..b956edf70f 100755
--- a/cpp/bootstrap
+++ b/cpp/bootstrap
@@ -17,13 +17,13 @@ if test -d ../specs; then
# contents of the sole automake-else clause (the warning), then
# use the result to run the rules that create gen-src.mk, a file
# that must be created before we run automake.
- (cd gen && rm -f gen-src.mk
+ (cd src/gen && rm -f gen-src.mk
perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \
| make -f - srcdir=. gen-src.mk > /dev/null )
fi
# Generate (for automake) lots of repetitive parts of tests/Makefile.am.
-(cd tests && rm -f gen.mk
+(cd src/tests && rm -f gen.mk
perl -ne '/^include / or print' Makefile.am \
| make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null )
diff --git a/cpp/configure.ac b/cpp/configure.ac
index f4dcf32c28..14bc41deaf 100644
--- a/cpp/configure.ac
+++ b/cpp/configure.ac
@@ -16,7 +16,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AC_PREREQ(2.59)
AC_CONFIG_HEADERS([config.h:config.in])
-AC_CONFIG_SRCDIR([lib/broker/Broker.cpp])
+AC_CONFIG_SRCDIR([src/broker/Broker.cpp])
AC_PROG_CC_STDC
AM_PROG_CC_C_O
@@ -138,13 +138,11 @@ test "$enable_VALGRIND" = no && VALGRIND=
AC_CONFIG_FILES([
Makefile
- gen/Makefile
- lib/Makefile
- lib/common/Makefile
- lib/client/Makefile
- lib/broker/Makefile
+ src/gen/Makefile
+ src/client/Makefile
+ src/broker/Makefile
src/Makefile
- tests/Makefile
+ src/tests/Makefile
docs/man/Makefile
docs/api/Makefile
rpm/Makefile
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 165680457b..c41ca3406d 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -31,7 +31,7 @@
#include <sstream>
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
namespace qpid {
namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index e3602e20b7..a1613c77f0 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -27,8 +27,8 @@
*/
#include <sstream>
#include "AMQP_ClientProxy.h"
-#include "../lib/common/framing/ChannelAdapter.h"
-#include "../lib/common/framing/amqp_types_full.h"
+#include "../framing/ChannelAdapter.h"
+#include "../framing/amqp_types_full.h"
%{MLIST} ${cpc_method_body_include}
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 05ff2aa5b1..04f1f1020a 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -29,7 +29,7 @@
#ifndef qpid_framing_AMQP_ClientProxy__
#define qpid_framing_AMQP_ClientProxy__
-#include "../lib/common/framing/Proxy.h"
+#include "../framing/Proxy.h"
namespace qpid {
namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
index 3d5dacf4dc..fdbeb077d3 100644
--- a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
@@ -28,7 +28,7 @@
#ifndef qpid_framing_highestProtocolVersion__
#define qpid_framing_highestProtocolVersion__
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
namespace qpid {
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index bfb9ce1307..ea61c1c91d 100644
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -27,7 +27,7 @@
*/
#include <sstream>
-#include "../lib/common/framing/ProtocolVersionException.h"
+#include "../framing/ProtocolVersionException.h"
#include "AMQP_MethodVersionMap.h"
namespace qpid
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 530f76f599..2bfadc80dd 100644
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -30,7 +30,7 @@
#define qpid_framing_AMQP_MethodVersionMap__
#include <map>
-#include "../lib/common/framing/AMQMethodBody.h"
+#include "../framing/AMQMethodBody.h"
%{MLIST} ${mc_method_body_include}
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 1508815144..5b260f1882 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -29,7 +29,7 @@
#ifndef qpid_framing_AMQP_ServerOperations__
#define qpid_framing_AMQP_ServerOperations__
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
namespace qpid {
namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index c45af6a996..9877047d26 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -28,8 +28,8 @@
#include <sstream>
#include "AMQP_ServerProxy.h"
-#include "../lib/common/framing/ChannelAdapter.h"
-#include "../lib/common/framing/amqp_types_full.h"
+#include "../framing/ChannelAdapter.h"
+#include "../framing/amqp_types_full.h"
%{MLIST} ${spc_method_body_include}
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 5e9ced4375..e07a1fcf9c 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,7 +29,7 @@
#ifndef qpid_framing_AMQP_ServerProxy__
#define qpid_framing_AMQP_ServerProxy__
-#include "../lib/common/framing/Proxy.h"
+#include "../framing/Proxy.h"
namespace qpid {
namespace framing {
diff --git a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 2b5b6a541c..68f3e92a45 100644
--- a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -32,11 +32,11 @@
#include <string>
#include <sstream>
-#include "../lib/common/framing/amqp_types.h"
-#include "${mb_base_class}.h"
-#include "../lib/common/framing/Buffer.h"
-#include "../lib/common/framing/FieldTable.h"
-#include "../lib/common/framing/FramingContent.h"
+#include "../framing/amqp_types.h"
+#include "../framing/${mb_base_class}.h"
+#include "../framing/Buffer.h"
+#include "../framing/FieldTable.h"
+#include "../framing/FramingContent.h"
namespace qpid
{
diff --git a/cpp/lib/Makefile.am b/cpp/lib/Makefile.am
deleted file mode 100644
index 09a689bc76..0000000000
--- a/cpp/lib/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = common broker client
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
deleted file mode 100644
index 355f764b6e..0000000000
--- a/cpp/lib/common/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-AM_CXXFLAGS = $(WARNING_CFLAGS)
-
-INCLUDES = \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing \
- $(APR_CXXFLAGS)
-
-apr = sys/apr
-apr_src = \
- $(apr)/APRAcceptor.cpp \
- $(apr)/APRBase.cpp \
- $(apr)/APRPool.cpp \
- $(apr)/APRSocket.cpp \
- $(apr)/LFProcessor.cpp \
- $(apr)/LFSessionContext.cpp \
- $(apr)/Socket.cpp \
- $(apr)/Thread.cpp
-apr_hdr = \
- $(apr)/APRBase.h \
- $(apr)/APRPool.h \
- $(apr)/APRSocket.h \
- $(apr)/LFProcessor.h \
- $(apr)/LFSessionContext.h
-
-posix = sys/posix
-posix_src = \
- $(posix)/PosixAcceptor.cpp \
- $(posix)/Socket.cpp \
- $(posix)/Thread.cpp \
- $(posix)/check.cpp \
- $(posix)/EventChannel.cpp \
- $(posix)/EventChannelThreads.cpp
-posix_hdr = \
- $(posix)/check.h \
- $(posix)/EventChannel.h \
- $(posix)/EventChannelThreads.h
-
-EXTRA_DIST=$(posix_src) $(posix_hdr)
-platform_src = $(apr_src)
-platform_hdr = $(apr_hdr)
-
-framing = framing
-gen = $(srcdir)/../../gen
-
-lib_LTLIBRARIES = libqpidcommon.la
-libqpidcommon_la_LIBADD = \
- $(APR_LIBS) \
- $(LIB_DLOPEN) \
- $(LIB_CLOCK_GETTIME)
-
-libqpidcommon_la_LDFLAGS = \
- -version-info \
- $(LIBTOOL_VERSION_INFO_ARG)
-
-libqpidcommon_la_SOURCES = \
- $(platform_src) \
- $(framing)/AMQBody.cpp \
- $(framing)/AMQRequestBody.cpp \
- $(framing)/AMQResponseBody.cpp \
- $(framing)/AMQContentBody.cpp \
- $(framing)/AMQFrame.cpp \
- $(framing)/AMQHeaderBody.cpp \
- $(framing)/AMQHeartbeatBody.cpp \
- $(framing)/AMQMethodBody.cpp \
- $(framing)/MethodContext.cpp \
- $(framing)/BasicHeaderProperties.cpp \
- $(framing)/BodyHandler.cpp \
- $(framing)/ChannelAdapter.cpp \
- $(framing)/Buffer.cpp \
- $(framing)/FieldTable.cpp \
- $(framing)/FramingContent.cpp \
- $(framing)/InitiationHandler.cpp \
- $(framing)/ProtocolInitiation.cpp \
- $(framing)/ProtocolVersion.cpp \
- $(framing)/ProtocolVersionException.cpp \
- $(framing)/Requester.cpp \
- $(framing)/Responder.cpp \
- $(framing)/Value.cpp \
- $(framing)/Proxy.cpp \
- $(gen)/AMQP_ClientProxy.cpp \
- $(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
-
-nobase_pkginclude_HEADERS = \
- $(gen)/AMQP_HighestVersion.h \
- $(platform_hdr) \
- $(framing)/AMQBody.h \
- $(framing)/AMQContentBody.h \
- $(framing)/AMQDataBlock.h \
- $(framing)/AMQFrame.h \
- $(framing)/AMQHeaderBody.h \
- $(framing)/AMQHeartbeatBody.h \
- $(framing)/AMQMethodBody.h \
- $(framing)/MethodContext.h \
- $(framing)/BasicHeaderProperties.h \
- $(framing)/BodyHandler.h \
- $(framing)/ChannelAdapter.h \
- $(framing)/Buffer.h \
- $(framing)/FieldTable.h \
- $(framing)/FramingContent.h \
- $(framing)/HeaderProperties.h \
- $(framing)/InitiationHandler.h \
- $(framing)/InputHandler.h \
- $(framing)/OutputHandler.h \
- $(framing)/ProtocolInitiation.h \
- $(framing)/ProtocolVersion.h \
- $(framing)/ProtocolVersionException.h \
- $(framing)/Value.h \
- $(framing)/amqp_framing.h \
- $(framing)/amqp_types.h \
- $(framing)/Proxy.h \
- shared_ptr.h \
- Exception.h \
- ExceptionHolder.h \
- QpidError.h \
- SharedObject.h \
- sys/Acceptor.h \
- sys/AtomicCount.h \
- sys/Module.h \
- sys/Monitor.h \
- sys/Mutex.h \
- sys/Runnable.h \
- sys/ConnectionOutputHandler.h \
- sys/ConnectionInputHandler.h \
- sys/ConnectionInputHandlerFactory.h \
- sys/ShutdownHandler.h \
- sys/Socket.h \
- sys/Thread.h \
- sys/Time.h \
- sys/TimeoutHandler.h \
- sys/ProducerConsumer.h
-
-
-# Force build during dist phase so help2man will work.
-dist-hook: $(lib_LTLIBRARIES)
diff --git a/cpp/lib/common/Exception.cpp b/cpp/src/Exception.cpp
index f7d91498e0..1bbf89e99f 100644
--- a/cpp/lib/common/Exception.cpp
+++ b/cpp/src/Exception.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <Exception.h>
+#include "Exception.h"
namespace qpid {
diff --git a/cpp/lib/common/Exception.h b/cpp/src/Exception.h
index b8cd68cf8c..4fbad7efaa 100644
--- a/cpp/lib/common/Exception.h
+++ b/cpp/src/Exception.h
@@ -27,7 +27,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/lexical_cast.hpp>
-#include "amqp_types.h"
+#include "framing/amqp_types.h"
namespace qpid
{
diff --git a/cpp/lib/common/ExceptionHolder.cpp b/cpp/src/ExceptionHolder.cpp
index de8d7b2487..de8d7b2487 100644
--- a/cpp/lib/common/ExceptionHolder.cpp
+++ b/cpp/src/ExceptionHolder.cpp
diff --git a/cpp/lib/common/ExceptionHolder.h b/cpp/src/ExceptionHolder.h
index 2769455aba..723dac4b2d 100644
--- a/cpp/lib/common/ExceptionHolder.h
+++ b/cpp/src/ExceptionHolder.h
@@ -20,7 +20,7 @@
*/
#include <assert.h>
-#include <Exception.h>
+#include "Exception.h"
#include <boost/shared_ptr.hpp>
namespace qpid {
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 40398eb2c9..22bcd5c554 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -1,17 +1,150 @@
+SUBDIRS = broker . client tests gen
+
AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/broker \
- -I$(top_srcdir)/lib/common \
- -I$(top_srcdir)/lib/common/framing \
- -I$(top_srcdir)/lib/common/sys
-LDADD = \
- ../lib/broker/libqpidbroker.la \
- ../lib/common/libqpidcommon.la
+INCLUDES = \
+ -I$(srcdir)/gen \
+ $(APR_CXXFLAGS)
+
+qpidd_LDADD = \
+ broker/libqpidbroker.la \
+ libqpidcommon.la
sbin_PROGRAMS = qpidd
qpidd_SOURCES = qpidd.cpp
-# Force build of qpidd during dist phase so help2man will work.
-dist-hook: $(sbin_PROGRAMS)
+apr = sys/apr
+apr_src = \
+ $(apr)/APRAcceptor.cpp \
+ $(apr)/APRBase.cpp \
+ $(apr)/APRPool.cpp \
+ $(apr)/APRSocket.cpp \
+ $(apr)/LFProcessor.cpp \
+ $(apr)/LFSessionContext.cpp \
+ $(apr)/Socket.cpp \
+ $(apr)/Thread.cpp
+apr_hdr = \
+ $(apr)/APRBase.h \
+ $(apr)/APRPool.h \
+ $(apr)/APRSocket.h \
+ $(apr)/LFProcessor.h \
+ $(apr)/LFSessionContext.h
+
+posix = sys/posix
+posix_src = \
+ $(posix)/PosixAcceptor.cpp \
+ $(posix)/Socket.cpp \
+ $(posix)/Thread.cpp \
+ $(posix)/check.cpp \
+ $(posix)/EventChannel.cpp \
+ $(posix)/EventChannelThreads.cpp
+posix_hdr = \
+ $(posix)/check.h \
+ $(posix)/EventChannel.h \
+ $(posix)/EventChannelThreads.h
+
+EXTRA_DIST=$(posix_src) $(posix_hdr)
+platform_src = $(apr_src)
+platform_hdr = $(apr_hdr)
+
+framing = framing
+gen = gen
+
+lib_LTLIBRARIES = libqpidcommon.la
+libqpidcommon_la_LIBADD = \
+ $(APR_LIBS) \
+ $(LIB_DLOPEN) \
+ $(LIB_CLOCK_GETTIME)
+
+libqpidcommon_la_LDFLAGS = \
+ -version-info \
+ $(LIBTOOL_VERSION_INFO_ARG)
+
+libqpidcommon_la_SOURCES = \
+ $(platform_src) \
+ $(framing)/AMQBody.cpp \
+ $(framing)/AMQRequestBody.cpp \
+ $(framing)/AMQResponseBody.cpp \
+ $(framing)/AMQContentBody.cpp \
+ $(framing)/AMQFrame.cpp \
+ $(framing)/AMQHeaderBody.cpp \
+ $(framing)/AMQHeartbeatBody.cpp \
+ $(framing)/AMQMethodBody.cpp \
+ $(framing)/MethodContext.cpp \
+ $(framing)/BasicHeaderProperties.cpp \
+ $(framing)/BodyHandler.cpp \
+ $(framing)/ChannelAdapter.cpp \
+ $(framing)/Buffer.cpp \
+ $(framing)/FieldTable.cpp \
+ $(framing)/FramingContent.cpp \
+ $(framing)/InitiationHandler.cpp \
+ $(framing)/ProtocolInitiation.cpp \
+ $(framing)/ProtocolVersion.cpp \
+ $(framing)/ProtocolVersionException.cpp \
+ $(framing)/Requester.cpp \
+ $(framing)/Responder.cpp \
+ $(framing)/Value.cpp \
+ $(framing)/Proxy.cpp \
+ $(gen)/AMQP_ClientProxy.cpp \
+ $(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
+
+nobase_pkginclude_HEADERS = \
+ $(gen)/AMQP_HighestVersion.h \
+ $(platform_hdr) \
+ $(framing)/AMQBody.h \
+ $(framing)/AMQContentBody.h \
+ $(framing)/AMQDataBlock.h \
+ $(framing)/AMQFrame.h \
+ $(framing)/AMQHeaderBody.h \
+ $(framing)/AMQHeartbeatBody.h \
+ $(framing)/AMQMethodBody.h \
+ $(framing)/MethodContext.h \
+ $(framing)/BasicHeaderProperties.h \
+ $(framing)/BodyHandler.h \
+ $(framing)/ChannelAdapter.h \
+ $(framing)/Buffer.h \
+ $(framing)/FieldTable.h \
+ $(framing)/FramingContent.h \
+ $(framing)/HeaderProperties.h \
+ $(framing)/InitiationHandler.h \
+ $(framing)/InputHandler.h \
+ $(framing)/OutputHandler.h \
+ $(framing)/ProtocolInitiation.h \
+ $(framing)/ProtocolVersion.h \
+ $(framing)/ProtocolVersionException.h \
+ $(framing)/Value.h \
+ $(framing)/amqp_framing.h \
+ $(framing)/amqp_types.h \
+ $(framing)/Proxy.h \
+ shared_ptr.h \
+ Exception.h \
+ ExceptionHolder.h \
+ QpidError.h \
+ SharedObject.h \
+ sys/Acceptor.h \
+ sys/AtomicCount.h \
+ sys/Module.h \
+ sys/Monitor.h \
+ sys/Mutex.h \
+ sys/Runnable.h \
+ sys/ConnectionOutputHandler.h \
+ sys/ConnectionInputHandler.h \
+ sys/ConnectionInputHandlerFactory.h \
+ sys/ShutdownHandler.h \
+ sys/Socket.h \
+ sys/Thread.h \
+ sys/Time.h \
+ sys/TimeoutHandler.h \
+ sys/ProducerConsumer.h
+
+
+# Force build during dist phase so help2man will work.
+dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS)
diff --git a/cpp/lib/common/QpidError.cpp b/cpp/src/QpidError.cpp
index 9cd3051d1e..365c84ea1d 100644
--- a/cpp/lib/common/QpidError.cpp
+++ b/cpp/src/QpidError.cpp
@@ -21,7 +21,7 @@
#include <boost/format.hpp>
-#include <QpidError.h>
+#include "QpidError.h"
#include <sstream>
using namespace qpid;
diff --git a/cpp/lib/common/QpidError.h b/cpp/src/QpidError.h
index 2a0395ab79..12e80c9bd9 100644
--- a/cpp/lib/common/QpidError.h
+++ b/cpp/src/QpidError.h
@@ -24,7 +24,7 @@
#include <memory>
#include <ostream>
-#include <Exception.h>
+#include "Exception.h"
namespace qpid {
diff --git a/cpp/lib/common/SharedObject.h b/cpp/src/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/cpp/lib/common/SharedObject.h
+++ b/cpp/src/SharedObject.h
diff --git a/cpp/lib/broker/AccumulatedAck.cpp b/cpp/src/broker/AccumulatedAck.cpp
index ff471b0287..ff471b0287 100644
--- a/cpp/lib/broker/AccumulatedAck.cpp
+++ b/cpp/src/broker/AccumulatedAck.cpp
diff --git a/cpp/lib/broker/AccumulatedAck.h b/cpp/src/broker/AccumulatedAck.h
index c4a6e3b79b..c4a6e3b79b 100644
--- a/cpp/lib/broker/AccumulatedAck.h
+++ b/cpp/src/broker/AccumulatedAck.h
diff --git a/cpp/lib/broker/AutoDelete.cpp b/cpp/src/broker/AutoDelete.cpp
index 2037a9c71c..dee8a0ec78 100644
--- a/cpp/lib/broker/AutoDelete.cpp
+++ b/cpp/src/broker/AutoDelete.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <AutoDelete.h>
-#include <sys/Time.h>
+#include "AutoDelete.h"
+#include "../sys/Time.h"
using namespace qpid::broker;
using namespace qpid::sys;
diff --git a/cpp/lib/broker/AutoDelete.h b/cpp/src/broker/AutoDelete.h
index 9034de1730..8cfd37325f 100644
--- a/cpp/lib/broker/AutoDelete.h
+++ b/cpp/src/broker/AutoDelete.h
@@ -22,10 +22,10 @@
*/
#include <iostream>
#include <queue>
-#include <sys/Monitor.h>
-#include <BrokerQueue.h>
-#include <QueueRegistry.h>
-#include <sys/Thread.h>
+#include "../sys/Monitor.h"
+#include "BrokerQueue.h"
+#include "QueueRegistry.h"
+#include "../sys/Thread.h"
namespace qpid {
namespace broker{
diff --git a/cpp/lib/broker/Broker.cpp b/cpp/src/broker/Broker.cpp
index fa80867b69..13da64915d 100644
--- a/cpp/lib/broker/Broker.cpp
+++ b/cpp/src/broker/Broker.cpp
@@ -21,19 +21,19 @@
#include <iostream>
#include <memory>
-#include "AMQFrame.h"
+#include "../framing/AMQFrame.h"
#include "DirectExchange.h"
#include "TopicExchange.h"
#include "FanOutExchange.h"
#include "HeadersExchange.h"
#include "MessageStoreModule.h"
#include "NullMessageStore.h"
-#include "ProtocolInitiation.h"
+#include "../framing/ProtocolInitiation.h"
#include "RecoveryManagerImpl.h"
#include "Connection.h"
-#include "sys/ConnectionInputHandler.h"
-#include "sys/ConnectionInputHandlerFactory.h"
-#include "sys/TimeoutHandler.h"
+#include "../sys/ConnectionInputHandler.h"
+#include "../sys/ConnectionInputHandlerFactory.h"
+#include "../sys/TimeoutHandler.h"
#include "Broker.h"
diff --git a/cpp/lib/broker/Broker.h b/cpp/src/broker/Broker.h
index 68c04336d8..f713f0955b 100644
--- a/cpp/lib/broker/Broker.h
+++ b/cpp/src/broker/Broker.h
@@ -22,19 +22,19 @@
*
*/
-#include <Configuration.h>
-#include <ConnectionFactory.h>
-#include <sys/Runnable.h>
-#include <sys/Acceptor.h>
-#include <SharedObject.h>
-#include <MessageStore.h>
-#include <AutoDelete.h>
-#include <ExchangeRegistry.h>
-#include <ConnectionToken.h>
-#include <DirectExchange.h>
-#include <OutputHandler.h>
-#include <ProtocolInitiation.h>
-#include <QueueRegistry.h>
+#include "Configuration.h"
+#include "ConnectionFactory.h"
+#include "../sys/Runnable.h"
+#include "../sys/Acceptor.h"
+#include "../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 "QueueRegistry.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/BrokerAdapter.cpp b/cpp/src/broker/BrokerAdapter.cpp
index 981801c40e..d04610c877 100644
--- a/cpp/lib/broker/BrokerAdapter.cpp
+++ b/cpp/src/broker/BrokerAdapter.cpp
@@ -20,8 +20,8 @@
#include "BrokerAdapter.h"
#include "BrokerChannel.h"
#include "Connection.h"
-#include "AMQMethodBody.h"
-#include "Exception.h"
+#include "../framing/AMQMethodBody.h"
+#include "../Exception.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/BrokerAdapter.h b/cpp/src/broker/BrokerAdapter.h
index 2fafbcc180..4af45162f0 100644
--- a/cpp/lib/broker/BrokerAdapter.h
+++ b/cpp/src/broker/BrokerAdapter.h
@@ -21,7 +21,7 @@
#include "AMQP_ServerOperations.h"
#include "HandlerImpl.h"
#include "MessageHandlerImpl.h"
-#include "Exception.h"
+#include "../Exception.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/BrokerChannel.cpp b/cpp/src/broker/BrokerChannel.cpp
index 5897914f26..5f35f36da6 100644
--- a/cpp/lib/broker/BrokerChannel.cpp
+++ b/cpp/src/broker/BrokerChannel.cpp
@@ -29,14 +29,14 @@
#include "BrokerChannel.h"
#include "DeletingTxOp.h"
-#include "framing/ChannelAdapter.h"
-#include <QpidError.h>
-#include <DeliverableMessage.h>
-#include <BrokerQueue.h>
-#include <BrokerMessage.h>
-#include <MessageStore.h>
-#include <TxAck.h>
-#include <TxPublish.h>
+#include "../framing/ChannelAdapter.h"
+#include "../QpidError.h"
+#include "DeliverableMessage.h"
+#include "BrokerQueue.h"
+#include "BrokerMessage.h"
+#include "MessageStore.h"
+#include "TxAck.h"
+#include "TxPublish.h"
#include "BrokerAdapter.h"
#include "Connection.h"
diff --git a/cpp/lib/broker/BrokerChannel.h b/cpp/src/broker/BrokerChannel.h
index 5085783685..e2a96aa467 100644
--- a/cpp/lib/broker/BrokerChannel.h
+++ b/cpp/src/broker/BrokerChannel.h
@@ -28,14 +28,14 @@
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_map.hpp>
-#include <AccumulatedAck.h>
-#include <Consumer.h>
-#include <DeliveryRecord.h>
-#include <MessageBuilder.h>
-#include <NameGenerator.h>
-#include <Prefetch.h>
-#include <TxBuffer.h>
-#include "framing/ChannelAdapter.h"
+#include "AccumulatedAck.h"
+#include "Consumer.h"
+#include "DeliveryRecord.h"
+#include "MessageBuilder.h"
+#include "NameGenerator.h"
+#include "Prefetch.h"
+#include "TxBuffer.h"
+#include "../framing/ChannelAdapter.h"
#include "ChannelOpenBody.h"
#include "CompletionHandler.h"
diff --git a/cpp/lib/broker/BrokerExchange.h b/cpp/src/broker/BrokerExchange.h
index 6f4e9e6671..07a411335a 100644
--- a/cpp/lib/broker/BrokerExchange.h
+++ b/cpp/src/broker/BrokerExchange.h
@@ -23,9 +23,9 @@
*/
#include <boost/shared_ptr.hpp>
-#include <Deliverable.h>
-#include <BrokerQueue.h>
-#include <FieldTable.h>
+#include "Deliverable.h"
+#include "BrokerQueue.h"
+#include "../framing/FieldTable.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/BrokerMessage.cpp b/cpp/src/broker/BrokerMessage.cpp
index b14efb966e..06765bcaa9 100644
--- a/cpp/lib/broker/BrokerMessage.cpp
+++ b/cpp/src/broker/BrokerMessage.cpp
@@ -20,19 +20,19 @@
*/
#include <boost/cast.hpp>
-#include <BrokerMessage.h>
+#include "BrokerMessage.h"
#include <iostream>
-#include <InMemoryContent.h>
-#include <LazyLoadedContent.h>
-#include <MessageStore.h>
-#include <BasicDeliverBody.h>
-#include <BasicGetOkBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeaderBody.h>
-#include "AMQMethodBody.h"
-#include "AMQFrame.h"
-#include "framing/ChannelAdapter.h"
+#include "InMemoryContent.h"
+#include "LazyLoadedContent.h"
+#include "MessageStore.h"
+#include "BasicDeliverBody.h"
+#include "BasicGetOkBody.h"
+#include "../framing/AMQContentBody.h"
+#include "../framing/AMQHeaderBody.h"
+#include "../framing/AMQMethodBody.h"
+#include "../framing/AMQFrame.h"
+#include "../framing/ChannelAdapter.h"
#include "RecoveryManagerImpl.h"
using namespace boost;
diff --git a/cpp/lib/broker/BrokerMessage.h b/cpp/src/broker/BrokerMessage.h
index 8b408ae669..1d13183f43 100644
--- a/cpp/lib/broker/BrokerMessage.h
+++ b/cpp/src/broker/BrokerMessage.h
@@ -25,12 +25,12 @@
#include <memory>
#include <boost/shared_ptr.hpp>
-#include <BrokerMessageBase.h>
-#include <BasicHeaderProperties.h>
-#include <ConnectionToken.h>
-#include <Content.h>
-#include <Mutex.h>
-#include <TxBuffer.h>
+#include "BrokerMessageBase.h"
+#include "../framing/BasicHeaderProperties.h"
+#include "ConnectionToken.h"
+#include "Content.h"
+#include "../sys/Mutex.h"
+#include "TxBuffer.h"
namespace qpid {
diff --git a/cpp/lib/broker/BrokerMessageBase.h b/cpp/src/broker/BrokerMessageBase.h
index da0cc57756..93178774dd 100644
--- a/cpp/lib/broker/BrokerMessageBase.h
+++ b/cpp/src/broker/BrokerMessageBase.h
@@ -26,7 +26,7 @@
#include <boost/shared_ptr.hpp>
#include "Content.h"
#include "PersistableMessage.h"
-#include "framing/amqp_types.h"
+#include "../framing/amqp_types.h"
namespace qpid {
diff --git a/cpp/lib/broker/BrokerMessageMessage.cpp b/cpp/src/broker/BrokerMessageMessage.cpp
index 73ad961938..f320a0915e 100644
--- a/cpp/lib/broker/BrokerMessageMessage.cpp
+++ b/cpp/src/broker/BrokerMessageMessage.cpp
@@ -18,17 +18,17 @@
* under the License.
*
*/
-#include "QpidError.h"
+#include "../QpidError.h"
#include "BrokerMessageMessage.h"
-#include "ChannelAdapter.h"
+#include "../framing/ChannelAdapter.h"
#include "MessageTransferBody.h"
#include "MessageOpenBody.h"
#include "MessageCloseBody.h"
#include "MessageAppendBody.h"
#include "Reference.h"
-#include "framing/AMQFrame.h"
-#include "framing/FieldTable.h"
-#include "framing/BasicHeaderProperties.h"
+#include "../framing/AMQFrame.h"
+#include "../framing/FieldTable.h"
+#include "../framing/BasicHeaderProperties.h"
#include "RecoveryManagerImpl.h"
#include <algorithm>
diff --git a/cpp/lib/broker/BrokerMessageMessage.h b/cpp/src/broker/BrokerMessageMessage.h
index 1da171fba8..88ac07ecc3 100644
--- a/cpp/lib/broker/BrokerMessageMessage.h
+++ b/cpp/src/broker/BrokerMessageMessage.h
@@ -23,7 +23,7 @@
*/
#include "BrokerMessageBase.h"
#include "MessageTransferBody.h"
-#include "amqp_types.h"
+#include "../framing/amqp_types.h"
#include <vector>
diff --git a/cpp/lib/broker/BrokerQueue.cpp b/cpp/src/broker/BrokerQueue.cpp
index e2b59aa766..08288a9dbd 100644
--- a/cpp/lib/broker/BrokerQueue.cpp
+++ b/cpp/src/broker/BrokerQueue.cpp
@@ -21,10 +21,10 @@
#include <boost/format.hpp>
-#include <BrokerQueue.h>
-#include <MessageStore.h>
-#include <sys/Monitor.h>
-#include <sys/Time.h>
+#include "BrokerQueue.h"
+#include "MessageStore.h"
+#include "../sys/Monitor.h"
+#include "../sys/Time.h"
#include <iostream>
#include "QueueRegistry.h"
diff --git a/cpp/lib/broker/BrokerQueue.h b/cpp/src/broker/BrokerQueue.h
index 20d81e4e87..009f95b384 100644
--- a/cpp/lib/broker/BrokerQueue.h
+++ b/cpp/src/broker/BrokerQueue.h
@@ -25,14 +25,14 @@
#include <memory>
#include <queue>
#include <boost/shared_ptr.hpp>
-#include <amqp_types.h>
-#include <ConnectionToken.h>
-#include <Consumer.h>
-#include <BrokerMessage.h>
-#include <FieldTable.h>
-#include <sys/Monitor.h>
+#include "../framing/amqp_types.h"
+#include "ConnectionToken.h"
+#include "Consumer.h"
+#include "BrokerMessage.h"
+#include "../framing/FieldTable.h"
+#include "../sys/Monitor.h"
#include "PersistableQueue.h"
-#include <QueuePolicy.h>
+#include "QueuePolicy.h"
// TODO aconway 2007-02-06: Use auto_ptr and boost::ptr_vector to
// enforce ownership of Consumers.
diff --git a/cpp/lib/broker/BrokerSingleton.cpp b/cpp/src/broker/BrokerSingleton.cpp
index 4571764850..4571764850 100644
--- a/cpp/lib/broker/BrokerSingleton.cpp
+++ b/cpp/src/broker/BrokerSingleton.cpp
diff --git a/cpp/lib/broker/BrokerSingleton.h b/cpp/src/broker/BrokerSingleton.h
index 139e02a5fd..139e02a5fd 100644
--- a/cpp/lib/broker/BrokerSingleton.h
+++ b/cpp/src/broker/BrokerSingleton.h
diff --git a/cpp/lib/broker/CompletionHandler.h b/cpp/src/broker/CompletionHandler.h
index 9d51656282..9d51656282 100644
--- a/cpp/lib/broker/CompletionHandler.h
+++ b/cpp/src/broker/CompletionHandler.h
diff --git a/cpp/lib/broker/Configuration.cpp b/cpp/src/broker/Configuration.cpp
index e83c359f2d..5050314679 100644
--- a/cpp/lib/broker/Configuration.cpp
+++ b/cpp/src/broker/Configuration.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <Configuration.h>
+#include "Configuration.h"
#include <string.h>
-#include <config.h>
+#include "../../config.h"
using namespace qpid::broker;
using namespace std;
diff --git a/cpp/lib/broker/Configuration.h b/cpp/src/broker/Configuration.h
index 27c743c8f0..d93bf5c45b 100644
--- a/cpp/lib/broker/Configuration.h
+++ b/cpp/src/broker/Configuration.h
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <iostream>
#include <vector>
-#include <Exception.h>
+#include "../Exception.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/Connection.cpp b/cpp/src/broker/Connection.cpp
index dbc8149cb5..dbc8149cb5 100644
--- a/cpp/lib/broker/Connection.cpp
+++ b/cpp/src/broker/Connection.cpp
diff --git a/cpp/lib/broker/Connection.h b/cpp/src/broker/Connection.h
index 5c6f40ca54..a36f1aa6ee 100644
--- a/cpp/lib/broker/Connection.h
+++ b/cpp/src/broker/Connection.h
@@ -26,15 +26,15 @@
#include <boost/ptr_container/ptr_map.hpp>
-#include <AMQFrame.h>
-#include <AMQP_ServerOperations.h>
-#include <AMQP_ClientProxy.h>
-#include <sys/ConnectionOutputHandler.h>
-#include <sys/ConnectionInputHandler.h>
-#include <sys/TimeoutHandler.h>
-#include "framing/ProtocolVersion.h"
+#include "../framing/AMQFrame.h"
+#include "AMQP_ServerOperations.h"
+#include "AMQP_ClientProxy.h"
+#include "../sys/ConnectionOutputHandler.h"
+#include "../sys/ConnectionInputHandler.h"
+#include "../sys/TimeoutHandler.h"
+#include "../framing/ProtocolVersion.h"
#include "Broker.h"
-#include "Exception.h"
+#include "../Exception.h"
#include "BrokerChannel.h"
namespace qpid {
diff --git a/cpp/lib/broker/ConnectionFactory.cpp b/cpp/src/broker/ConnectionFactory.cpp
index 0208e32b4d..5372bfe377 100644
--- a/cpp/lib/broker/ConnectionFactory.cpp
+++ b/cpp/src/broker/ConnectionFactory.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <ConnectionFactory.h>
+#include "ConnectionFactory.h"
#include "Connection.h"
namespace qpid {
diff --git a/cpp/lib/broker/ConnectionFactory.h b/cpp/src/broker/ConnectionFactory.h
index 9147384b2a..54fabb8089 100644
--- a/cpp/lib/broker/ConnectionFactory.h
+++ b/cpp/src/broker/ConnectionFactory.h
@@ -21,7 +21,7 @@
#ifndef _ConnectionFactory_
#define _ConnectionFactory_
-#include "ConnectionInputHandlerFactory.h"
+#include "../sys/ConnectionInputHandlerFactory.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/ConnectionToken.h b/cpp/src/broker/ConnectionToken.h
index 7e7f813d0e..7e7f813d0e 100644
--- a/cpp/lib/broker/ConnectionToken.h
+++ b/cpp/src/broker/ConnectionToken.h
diff --git a/cpp/lib/broker/Consumer.h b/cpp/src/broker/Consumer.h
index 26deef4a26..d0c397d184 100644
--- a/cpp/lib/broker/Consumer.h
+++ b/cpp/src/broker/Consumer.h
@@ -21,7 +21,7 @@
#ifndef _Consumer_
#define _Consumer_
-#include <BrokerMessage.h>
+#include "BrokerMessage.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/Content.h b/cpp/src/broker/Content.h
index b65a454778..dd895e2eb3 100644
--- a/cpp/lib/broker/Content.h
+++ b/cpp/src/broker/Content.h
@@ -23,9 +23,9 @@
#include <boost/function.hpp>
-#include <AMQContentBody.h>
-#include <Buffer.h>
-#include <OutputHandler.h>
+#include "../framing/AMQContentBody.h"
+#include "../framing/Buffer.h"
+#include "../framing/OutputHandler.h"
namespace qpid {
diff --git a/cpp/lib/broker/DeletingTxOp.cpp b/cpp/src/broker/DeletingTxOp.cpp
index 25fe9c98db..ae6ac0f2e6 100644
--- a/cpp/lib/broker/DeletingTxOp.cpp
+++ b/cpp/src/broker/DeletingTxOp.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <DeletingTxOp.h>
+#include "DeletingTxOp.h"
using namespace qpid::broker;
diff --git a/cpp/lib/broker/DeletingTxOp.h b/cpp/src/broker/DeletingTxOp.h
index 3e026cd4ca..ddef1c77c0 100644
--- a/cpp/lib/broker/DeletingTxOp.h
+++ b/cpp/src/broker/DeletingTxOp.h
@@ -21,7 +21,7 @@
#ifndef _DeletingTxOp_
#define _DeletingTxOp_
-#include <TxOp.h>
+#include "TxOp.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/Deliverable.h b/cpp/src/broker/Deliverable.h
index e33443555d..1570917849 100644
--- a/cpp/lib/broker/Deliverable.h
+++ b/cpp/src/broker/Deliverable.h
@@ -21,7 +21,7 @@
#ifndef _Deliverable_
#define _Deliverable_
-#include <BrokerQueue.h>
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/DeliverableMessage.cpp b/cpp/src/broker/DeliverableMessage.cpp
index b9c89da690..0c2e46ccce 100644
--- a/cpp/lib/broker/DeliverableMessage.cpp
+++ b/cpp/src/broker/DeliverableMessage.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <DeliverableMessage.h>
+#include "DeliverableMessage.h"
using namespace qpid::broker;
diff --git a/cpp/lib/broker/DeliverableMessage.h b/cpp/src/broker/DeliverableMessage.h
index 962f0da640..43e738a96a 100644
--- a/cpp/lib/broker/DeliverableMessage.h
+++ b/cpp/src/broker/DeliverableMessage.h
@@ -21,9 +21,9 @@
#ifndef _DeliverableMessage_
#define _DeliverableMessage_
-#include <Deliverable.h>
-#include <BrokerMessage.h>
-#include <BrokerQueue.h>
+#include "Deliverable.h"
+#include "BrokerMessage.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/DeliveryRecord.cpp b/cpp/src/broker/DeliveryRecord.cpp
index e0b5bcfeb1..95650b7b23 100644
--- a/cpp/lib/broker/DeliveryRecord.cpp
+++ b/cpp/src/broker/DeliveryRecord.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <DeliveryRecord.h>
-#include <BrokerChannel.h>
+#include "DeliveryRecord.h"
+#include "BrokerChannel.h"
using namespace qpid::broker;
using std::string;
diff --git a/cpp/lib/broker/DeliveryRecord.h b/cpp/src/broker/DeliveryRecord.h
index 9423dd2062..15c207ce44 100644
--- a/cpp/lib/broker/DeliveryRecord.h
+++ b/cpp/src/broker/DeliveryRecord.h
@@ -23,10 +23,10 @@
#include <algorithm>
#include <list>
-#include <AccumulatedAck.h>
-#include <BrokerMessage.h>
-#include <Prefetch.h>
-#include <BrokerQueue.h>
+#include "AccumulatedAck.h"
+#include "BrokerMessage.h"
+#include "Prefetch.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/DirectExchange.cpp b/cpp/src/broker/DirectExchange.cpp
index 0661e8c365..7d15410374 100644
--- a/cpp/lib/broker/DirectExchange.cpp
+++ b/cpp/src/broker/DirectExchange.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <DirectExchange.h>
+#include "DirectExchange.h"
#include <iostream>
using namespace qpid::broker;
diff --git a/cpp/lib/broker/DirectExchange.h b/cpp/src/broker/DirectExchange.h
index a7ef5aca9e..94b064327d 100644
--- a/cpp/lib/broker/DirectExchange.h
+++ b/cpp/src/broker/DirectExchange.h
@@ -23,11 +23,11 @@
#include <map>
#include <vector>
-#include <BrokerExchange.h>
-#include <FieldTable.h>
-#include <BrokerMessage.h>
-#include <sys/Monitor.h>
-#include <BrokerQueue.h>
+#include "BrokerExchange.h"
+#include "../framing/FieldTable.h"
+#include "BrokerMessage.h"
+#include "../sys/Monitor.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/ExchangeRegistry.cpp b/cpp/src/broker/ExchangeRegistry.cpp
index 3e5ed89b54..03863673df 100644
--- a/cpp/lib/broker/ExchangeRegistry.cpp
+++ b/cpp/src/broker/ExchangeRegistry.cpp
@@ -18,11 +18,11 @@
* under the License.
*
*/
-#include <ExchangeRegistry.h>
-#include <DirectExchange.h>
-#include <FanOutExchange.h>
-#include <HeadersExchange.h>
-#include <TopicExchange.h>
+#include "ExchangeRegistry.h"
+#include "DirectExchange.h"
+#include "FanOutExchange.h"
+#include "HeadersExchange.h"
+#include "TopicExchange.h"
using namespace qpid::broker;
using namespace qpid::sys;
diff --git a/cpp/lib/broker/ExchangeRegistry.h b/cpp/src/broker/ExchangeRegistry.h
index aeb32753df..1c81cb6021 100644
--- a/cpp/lib/broker/ExchangeRegistry.h
+++ b/cpp/src/broker/ExchangeRegistry.h
@@ -23,8 +23,8 @@
*/
#include <map>
-#include <BrokerExchange.h>
-#include <sys/Monitor.h>
+#include "BrokerExchange.h"
+#include "../sys/Monitor.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/FanOutExchange.cpp b/cpp/src/broker/FanOutExchange.cpp
index b487593efd..1ac92c89e2 100644
--- a/cpp/lib/broker/FanOutExchange.cpp
+++ b/cpp/src/broker/FanOutExchange.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <FanOutExchange.h>
+#include "FanOutExchange.h"
#include <algorithm>
using namespace qpid::broker;
diff --git a/cpp/lib/broker/FanOutExchange.h b/cpp/src/broker/FanOutExchange.h
index 6dc70e69bb..147383ba1a 100644
--- a/cpp/lib/broker/FanOutExchange.h
+++ b/cpp/src/broker/FanOutExchange.h
@@ -23,11 +23,11 @@
#include <map>
#include <vector>
-#include <BrokerExchange.h>
-#include <FieldTable.h>
-#include <BrokerMessage.h>
-#include <sys/Monitor.h>
-#include <BrokerQueue.h>
+#include "BrokerExchange.h"
+#include "../framing/FieldTable.h"
+#include "BrokerMessage.h"
+#include "../sys/Monitor.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/HandlerImpl.h b/cpp/src/broker/HandlerImpl.h
index c55a36da45..c55a36da45 100644
--- a/cpp/lib/broker/HandlerImpl.h
+++ b/cpp/src/broker/HandlerImpl.h
diff --git a/cpp/lib/broker/HeadersExchange.cpp b/cpp/src/broker/HeadersExchange.cpp
index 3ef0cc0446..21f23af00d 100644
--- a/cpp/lib/broker/HeadersExchange.cpp
+++ b/cpp/src/broker/HeadersExchange.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <HeadersExchange.h>
-#include <Value.h>
-#include <QpidError.h>
+#include "HeadersExchange.h"
+#include "../framing/Value.h"
+#include "../QpidError.h"
#include <algorithm>
diff --git a/cpp/lib/broker/HeadersExchange.h b/cpp/src/broker/HeadersExchange.h
index 5e8da5ad85..4d26b95f50 100644
--- a/cpp/lib/broker/HeadersExchange.h
+++ b/cpp/src/broker/HeadersExchange.h
@@ -22,11 +22,11 @@
#define _HeadersExchange_
#include <vector>
-#include <BrokerExchange.h>
-#include <FieldTable.h>
-#include <BrokerMessage.h>
-#include <sys/Monitor.h>
-#include <BrokerQueue.h>
+#include "BrokerExchange.h"
+#include "../framing/FieldTable.h"
+#include "BrokerMessage.h"
+#include "../sys/Monitor.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/InMemoryContent.cpp b/cpp/src/broker/InMemoryContent.cpp
index 237375e860..d5f3479894 100644
--- a/cpp/lib/broker/InMemoryContent.cpp
+++ b/cpp/src/broker/InMemoryContent.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <InMemoryContent.h>
-#include "AMQFrame.h"
-#include "framing/ChannelAdapter.h"
+#include "InMemoryContent.h"
+#include "../framing/AMQFrame.h"
+#include "../framing/ChannelAdapter.h"
using namespace qpid::broker;
using namespace qpid::framing;
diff --git a/cpp/lib/broker/InMemoryContent.h b/cpp/src/broker/InMemoryContent.h
index 7a58ace3a7..425f0e4e26 100644
--- a/cpp/lib/broker/InMemoryContent.h
+++ b/cpp/src/broker/InMemoryContent.h
@@ -21,7 +21,7 @@
#ifndef _InMemoryContent_
#define _InMemoryContent_
-#include <Content.h>
+#include "Content.h"
#include <vector>
diff --git a/cpp/lib/broker/LazyLoadedContent.cpp b/cpp/src/broker/LazyLoadedContent.cpp
index 9810ee671c..b5bead11a5 100644
--- a/cpp/lib/broker/LazyLoadedContent.cpp
+++ b/cpp/src/broker/LazyLoadedContent.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <LazyLoadedContent.h>
-#include "AMQFrame.h"
-#include "framing/ChannelAdapter.h"
+#include "LazyLoadedContent.h"
+#include "../framing/AMQFrame.h"
+#include "../framing/ChannelAdapter.h"
using namespace qpid::broker;
using namespace qpid::framing;
diff --git a/cpp/lib/broker/LazyLoadedContent.h b/cpp/src/broker/LazyLoadedContent.h
index 3306f6e3ba..9dff6158a5 100644
--- a/cpp/lib/broker/LazyLoadedContent.h
+++ b/cpp/src/broker/LazyLoadedContent.h
@@ -21,8 +21,8 @@
#ifndef _LazyLoadedContent_
#define _LazyLoadedContent_
-#include <Content.h>
-#include <MessageStore.h>
+#include "Content.h"
+#include "MessageStore.h"
#include "BrokerMessageBase.h"
namespace qpid {
diff --git a/cpp/lib/broker/Makefile.am b/cpp/src/broker/Makefile.am
index 29cfb0f347..22f66dc3d9 100644
--- a/cpp/lib/broker/Makefile.am
+++ b/cpp/src/broker/Makefile.am
@@ -1,13 +1,9 @@
AM_CXXFLAGS = $(WARNING_CFLAGS)
INCLUDES = \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing \
+ -I$(srcdir)/../gen \
$(APR_CXXFLAGS)
lib_LTLIBRARIES = libqpidbroker.la
-libqpidbroker_la_LIBADD = ../common/libqpidcommon.la
libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
libqpidbroker_la_SOURCES = \
AccumulatedAck.cpp \
diff --git a/cpp/lib/broker/MessageBuilder.cpp b/cpp/src/broker/MessageBuilder.cpp
index e99dcad7d6..6c33b38e72 100644
--- a/cpp/lib/broker/MessageBuilder.cpp
+++ b/cpp/src/broker/MessageBuilder.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <MessageBuilder.h>
+#include "MessageBuilder.h"
-#include <InMemoryContent.h>
-#include <LazyLoadedContent.h>
+#include "InMemoryContent.h"
+#include "LazyLoadedContent.h"
using namespace qpid::broker;
using namespace qpid::framing;
diff --git a/cpp/lib/broker/MessageBuilder.h b/cpp/src/broker/MessageBuilder.h
index 30834e1075..ffac707f3b 100644
--- a/cpp/lib/broker/MessageBuilder.h
+++ b/cpp/src/broker/MessageBuilder.h
@@ -22,13 +22,13 @@
#define _MessageBuilder_
#include <memory>
-#include <QpidError.h>
-#include <BrokerExchange.h>
-#include <BrokerMessage.h>
-#include <MessageStore.h>
-#include <AMQContentBody.h>
-#include <AMQHeaderBody.h>
-#include <BasicPublishBody.h>
+#include "../QpidError.h"
+#include "BrokerExchange.h"
+#include "BrokerMessage.h"
+#include "MessageStore.h"
+#include "../framing/AMQContentBody.h"
+#include "../framing/AMQHeaderBody.h"
+#include "BasicPublishBody.h"
#include "CompletionHandler.h"
namespace qpid {
diff --git a/cpp/lib/broker/MessageHandlerImpl.cpp b/cpp/src/broker/MessageHandlerImpl.cpp
index fa7c10f26c..2378047054 100644
--- a/cpp/lib/broker/MessageHandlerImpl.cpp
+++ b/cpp/src/broker/MessageHandlerImpl.cpp
@@ -16,10 +16,10 @@
*
*/
-#include "QpidError.h"
+#include "../QpidError.h"
#include "MessageHandlerImpl.h"
#include "BrokerChannel.h"
-#include "FramingContent.h"
+#include "../framing/FramingContent.h"
#include "Connection.h"
#include "Broker.h"
#include "BrokerMessageMessage.h"
diff --git a/cpp/lib/broker/MessageHandlerImpl.h b/cpp/src/broker/MessageHandlerImpl.h
index 872d429d5c..872d429d5c 100644
--- a/cpp/lib/broker/MessageHandlerImpl.h
+++ b/cpp/src/broker/MessageHandlerImpl.h
diff --git a/cpp/lib/broker/MessageStore.h b/cpp/src/broker/MessageStore.h
index 1d9ee86e48..1d9ee86e48 100644
--- a/cpp/lib/broker/MessageStore.h
+++ b/cpp/src/broker/MessageStore.h
diff --git a/cpp/lib/broker/MessageStoreModule.cpp b/cpp/src/broker/MessageStoreModule.cpp
index 9939440ecb..cbda7182c1 100644
--- a/cpp/lib/broker/MessageStoreModule.cpp
+++ b/cpp/src/broker/MessageStoreModule.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <MessageStoreModule.h>
+#include "MessageStoreModule.h"
#include <iostream>
using namespace qpid::broker;
diff --git a/cpp/lib/broker/MessageStoreModule.h b/cpp/src/broker/MessageStoreModule.h
index 1787a4f361..b11f844948 100644
--- a/cpp/lib/broker/MessageStoreModule.h
+++ b/cpp/src/broker/MessageStoreModule.h
@@ -21,11 +21,11 @@
#ifndef _MessageStoreModule_
#define _MessageStoreModule_
-#include <BrokerMessage.h>
-#include <MessageStore.h>
-#include <BrokerQueue.h>
-#include <RecoveryManager.h>
-#include <sys/Module.h>
+#include "BrokerMessage.h"
+#include "MessageStore.h"
+#include "BrokerQueue.h"
+#include "RecoveryManager.h"
+#include "../sys/Module.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/NameGenerator.cpp b/cpp/src/broker/NameGenerator.cpp
index 3f281859fa..8484f921e9 100644
--- a/cpp/lib/broker/NameGenerator.cpp
+++ b/cpp/src/broker/NameGenerator.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <NameGenerator.h>
+#include "NameGenerator.h"
#include <sstream>
using namespace qpid::broker;
diff --git a/cpp/lib/broker/NameGenerator.h b/cpp/src/broker/NameGenerator.h
index b2dbbdfb69..affcedba41 100644
--- a/cpp/lib/broker/NameGenerator.h
+++ b/cpp/src/broker/NameGenerator.h
@@ -21,7 +21,7 @@
#ifndef _NameGenerator_
#define _NameGenerator_
-#include <BrokerMessage.h>
+#include "BrokerMessage.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/NullMessageStore.cpp b/cpp/src/broker/NullMessageStore.cpp
index 0d53a31069..ac40987a44 100644
--- a/cpp/lib/broker/NullMessageStore.cpp
+++ b/cpp/src/broker/NullMessageStore.cpp
@@ -19,9 +19,9 @@
*
*/
-#include <NullMessageStore.h>
+#include "NullMessageStore.h"
-#include <RecoveryManager.h>
+#include "RecoveryManager.h"
#include <iostream>
diff --git a/cpp/lib/broker/NullMessageStore.h b/cpp/src/broker/NullMessageStore.h
index f1a321cff4..3d08e1a7a2 100644
--- a/cpp/lib/broker/NullMessageStore.h
+++ b/cpp/src/broker/NullMessageStore.h
@@ -21,9 +21,9 @@
#ifndef _NullMessageStore_
#define _NullMessageStore_
-#include <BrokerMessage.h>
-#include <MessageStore.h>
-#include <BrokerQueue.h>
+#include "BrokerMessage.h"
+#include "MessageStore.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/Persistable.h b/cpp/src/broker/Persistable.h
index 9f48643c9e..a53ea428ed 100644
--- a/cpp/lib/broker/Persistable.h
+++ b/cpp/src/broker/Persistable.h
@@ -22,8 +22,8 @@
*
*/
-#include "framing/amqp_types.h"
-#include "framing/Buffer.h"
+#include "../framing/amqp_types.h"
+#include "../framing/Buffer.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/PersistableExchange.h b/cpp/src/broker/PersistableExchange.h
index 9badf5f609..9badf5f609 100644
--- a/cpp/lib/broker/PersistableExchange.h
+++ b/cpp/src/broker/PersistableExchange.h
diff --git a/cpp/lib/broker/PersistableMessage.h b/cpp/src/broker/PersistableMessage.h
index f598e48709..c10d16bc65 100644
--- a/cpp/lib/broker/PersistableMessage.h
+++ b/cpp/src/broker/PersistableMessage.h
@@ -25,7 +25,7 @@
#include <string>
#include <boost/shared_ptr.hpp>
#include "Persistable.h"
-#include "framing/amqp_types.h"
+#include "../framing/amqp_types.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/PersistableQueue.h b/cpp/src/broker/PersistableQueue.h
index 5dd91dde9b..5dd91dde9b 100644
--- a/cpp/lib/broker/PersistableQueue.h
+++ b/cpp/src/broker/PersistableQueue.h
diff --git a/cpp/lib/broker/Prefetch.h b/cpp/src/broker/Prefetch.h
index b6d4026c3f..448156c187 100644
--- a/cpp/lib/broker/Prefetch.h
+++ b/cpp/src/broker/Prefetch.h
@@ -21,7 +21,7 @@
#ifndef _Prefetch_
#define _Prefetch_
-#include <amqp_types.h>
+#include "../framing/amqp_types.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/QueuePolicy.cpp b/cpp/src/broker/QueuePolicy.cpp
index 94b86f2bbb..620822cddc 100644
--- a/cpp/lib/broker/QueuePolicy.cpp
+++ b/cpp/src/broker/QueuePolicy.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <QueuePolicy.h>
+#include "QueuePolicy.h"
using namespace qpid::broker;
using namespace qpid::framing;
diff --git a/cpp/lib/broker/QueuePolicy.h b/cpp/src/broker/QueuePolicy.h
index e7688f3e67..28c3f81516 100644
--- a/cpp/lib/broker/QueuePolicy.h
+++ b/cpp/src/broker/QueuePolicy.h
@@ -21,7 +21,7 @@
#ifndef _QueuePolicy_
#define _QueuePolicy_
-#include <FieldTable.h>
+#include "../framing/FieldTable.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/QueueRegistry.cpp b/cpp/src/broker/QueueRegistry.cpp
index d33cd09840..dcaf7ec0f6 100644
--- a/cpp/lib/broker/QueueRegistry.cpp
+++ b/cpp/src/broker/QueueRegistry.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <QueueRegistry.h>
+#include "QueueRegistry.h"
#include <sstream>
#include <assert.h>
diff --git a/cpp/lib/broker/QueueRegistry.h b/cpp/src/broker/QueueRegistry.h
index 079034359e..5798226c48 100644
--- a/cpp/lib/broker/QueueRegistry.h
+++ b/cpp/src/broker/QueueRegistry.h
@@ -22,8 +22,8 @@
#define _QueueRegistry_
#include <map>
-#include <sys/Monitor.h>
-#include <BrokerQueue.h>
+#include "../sys/Monitor.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/RecoverableMessage.h b/cpp/src/broker/RecoverableMessage.h
index 4bb0d2c4a1..c79a84081c 100644
--- a/cpp/lib/broker/RecoverableMessage.h
+++ b/cpp/src/broker/RecoverableMessage.h
@@ -23,8 +23,8 @@
*/
#include <boost/shared_ptr.hpp>
-#include "framing/amqp_types.h"
-#include "framing/Buffer.h"
+#include "../framing/amqp_types.h"
+#include "../framing/Buffer.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/RecoverableQueue.h b/cpp/src/broker/RecoverableQueue.h
index a5c564b947..a5c564b947 100644
--- a/cpp/lib/broker/RecoverableQueue.h
+++ b/cpp/src/broker/RecoverableQueue.h
diff --git a/cpp/lib/broker/RecoveryManager.h b/cpp/src/broker/RecoveryManager.h
index 700bbdcf80..3f351f6a2e 100644
--- a/cpp/lib/broker/RecoveryManager.h
+++ b/cpp/src/broker/RecoveryManager.h
@@ -23,7 +23,7 @@
#include "RecoverableQueue.h"
#include "RecoverableMessage.h"
-#include "framing/Buffer.h"
+#include "../framing/Buffer.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/RecoveryManagerImpl.cpp b/cpp/src/broker/RecoveryManagerImpl.cpp
index c14f9c52cc..7c04ec9916 100644
--- a/cpp/lib/broker/RecoveryManagerImpl.cpp
+++ b/cpp/src/broker/RecoveryManagerImpl.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <RecoveryManagerImpl.h>
+#include "RecoveryManagerImpl.h"
#include "BrokerMessage.h"
#include "BrokerMessageMessage.h"
diff --git a/cpp/lib/broker/RecoveryManagerImpl.h b/cpp/src/broker/RecoveryManagerImpl.h
index c40de7895f..c40de7895f 100644
--- a/cpp/lib/broker/RecoveryManagerImpl.h
+++ b/cpp/src/broker/RecoveryManagerImpl.h
diff --git a/cpp/lib/broker/Reference.cpp b/cpp/src/broker/Reference.cpp
index bd1bdcb007..ef55d3e6a2 100644
--- a/cpp/lib/broker/Reference.cpp
+++ b/cpp/src/broker/Reference.cpp
@@ -19,7 +19,7 @@
#include <boost/bind.hpp>
#include "Reference.h"
#include "BrokerMessageMessage.h"
-#include "QpidError.h"
+#include "../QpidError.h"
#include "MessageAppendBody.h"
#include "CompletionHandler.h"
diff --git a/cpp/lib/broker/Reference.h b/cpp/src/broker/Reference.h
index 277eb7b917..277eb7b917 100644
--- a/cpp/lib/broker/Reference.h
+++ b/cpp/src/broker/Reference.h
diff --git a/cpp/lib/broker/TopicExchange.cpp b/cpp/src/broker/TopicExchange.cpp
index 796d3cea02..f29dfc38ba 100644
--- a/cpp/lib/broker/TopicExchange.cpp
+++ b/cpp/src/broker/TopicExchange.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TopicExchange.h>
+#include "TopicExchange.h"
#include <algorithm>
using namespace qpid::broker;
diff --git a/cpp/lib/broker/TopicExchange.h b/cpp/src/broker/TopicExchange.h
index fa0c86863a..8aba0911c0 100644
--- a/cpp/lib/broker/TopicExchange.h
+++ b/cpp/src/broker/TopicExchange.h
@@ -23,11 +23,11 @@
#include <map>
#include <vector>
-#include <BrokerExchange.h>
-#include <FieldTable.h>
-#include <BrokerMessage.h>
-#include <sys/Monitor.h>
-#include <BrokerQueue.h>
+#include "BrokerExchange.h"
+#include "../framing/FieldTable.h"
+#include "BrokerMessage.h"
+#include "../sys/Monitor.h"
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/TransactionalStore.h b/cpp/src/broker/TransactionalStore.h
index 9347edf0ad..9347edf0ad 100644
--- a/cpp/lib/broker/TransactionalStore.h
+++ b/cpp/src/broker/TransactionalStore.h
diff --git a/cpp/lib/broker/TxAck.cpp b/cpp/src/broker/TxAck.cpp
index a2f3283f91..60d8049102 100644
--- a/cpp/lib/broker/TxAck.cpp
+++ b/cpp/src/broker/TxAck.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TxAck.h>
+#include "TxAck.h"
using std::bind1st;
using std::bind2nd;
diff --git a/cpp/lib/broker/TxAck.h b/cpp/src/broker/TxAck.h
index d023cfae0d..5e6d0a370c 100644
--- a/cpp/lib/broker/TxAck.h
+++ b/cpp/src/broker/TxAck.h
@@ -24,9 +24,9 @@
#include <algorithm>
#include <functional>
#include <list>
-#include <AccumulatedAck.h>
-#include <DeliveryRecord.h>
-#include <TxOp.h>
+#include "AccumulatedAck.h"
+#include "DeliveryRecord.h"
+#include "TxOp.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/TxBuffer.cpp b/cpp/src/broker/TxBuffer.cpp
index e5701c3d46..47bc13b5c0 100644
--- a/cpp/lib/broker/TxBuffer.cpp
+++ b/cpp/src/broker/TxBuffer.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TxBuffer.h>
+#include "TxBuffer.h"
using std::mem_fun;
using namespace qpid::broker;
diff --git a/cpp/lib/broker/TxBuffer.h b/cpp/src/broker/TxBuffer.h
index 2d9a2a3679..61c0820c7d 100644
--- a/cpp/lib/broker/TxBuffer.h
+++ b/cpp/src/broker/TxBuffer.h
@@ -24,8 +24,8 @@
#include <algorithm>
#include <functional>
#include <vector>
-#include <TransactionalStore.h>
-#include <TxOp.h>
+#include "TransactionalStore.h"
+#include "TxOp.h"
/**
* Represents a single transaction. As such, an instance of this class
diff --git a/cpp/lib/broker/TxOp.h b/cpp/src/broker/TxOp.h
index abba84a8e8..8546a42616 100644
--- a/cpp/lib/broker/TxOp.h
+++ b/cpp/src/broker/TxOp.h
@@ -21,7 +21,7 @@
#ifndef _TxOp_
#define _TxOp_
-#include <TransactionalStore.h>
+#include "TransactionalStore.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/broker/TxPublish.cpp b/cpp/src/broker/TxPublish.cpp
index 57993782d0..687505909c 100644
--- a/cpp/lib/broker/TxPublish.cpp
+++ b/cpp/src/broker/TxPublish.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TxPublish.h>
+#include "TxPublish.h"
using namespace qpid::broker;
diff --git a/cpp/lib/broker/TxPublish.h b/cpp/src/broker/TxPublish.h
index 0c7596086a..29b1dc38af 100644
--- a/cpp/lib/broker/TxPublish.h
+++ b/cpp/src/broker/TxPublish.h
@@ -24,11 +24,11 @@
#include <algorithm>
#include <functional>
#include <list>
-#include <Deliverable.h>
-#include <BrokerMessage.h>
-#include <MessageStore.h>
-#include <BrokerQueue.h>
-#include <TxOp.h>
+#include "Deliverable.h"
+#include "BrokerMessage.h"
+#include "MessageStore.h"
+#include "BrokerQueue.h"
+#include "TxOp.h"
namespace qpid {
namespace broker {
diff --git a/cpp/lib/client/AckMode.h b/cpp/src/client/AckMode.h
index 9ad5ef925c..9ad5ef925c 100644
--- a/cpp/lib/client/AckMode.h
+++ b/cpp/src/client/AckMode.h
diff --git a/cpp/lib/client/BasicMessageChannel.cpp b/cpp/src/client/BasicMessageChannel.cpp
index d6929965ee..26c3fe543c 100644
--- a/cpp/lib/client/BasicMessageChannel.cpp
+++ b/cpp/src/client/BasicMessageChannel.cpp
@@ -16,11 +16,11 @@
*
*/
#include "BasicMessageChannel.h"
-#include "AMQMethodBody.h"
+#include "../framing/AMQMethodBody.h"
#include "ClientChannel.h"
#include "ReturnedMessageHandler.h"
#include "MessageListener.h"
-#include "framing/FieldTable.h"
+#include "../framing/FieldTable.h"
#include "Connection.h"
#include <queue>
#include <iostream>
diff --git a/cpp/lib/client/BasicMessageChannel.h b/cpp/src/client/BasicMessageChannel.h
index aaedfd6bf1..aaedfd6bf1 100644
--- a/cpp/lib/client/BasicMessageChannel.h
+++ b/cpp/src/client/BasicMessageChannel.h
diff --git a/cpp/lib/client/ClientAdapter.cpp b/cpp/src/client/ClientAdapter.cpp
index c77f049c96..4bf91f915b 100644
--- a/cpp/lib/client/ClientAdapter.cpp
+++ b/cpp/src/client/ClientAdapter.cpp
@@ -18,8 +18,8 @@
#include "AMQP_ClientOperations.h"
#include "ClientAdapter.h"
#include "Connection.h"
-#include "Exception.h"
-#include "AMQMethodBody.h"
+#include "../Exception.h"
+#include "../framing/AMQMethodBody.h"
namespace qpid {
namespace client {
diff --git a/cpp/lib/client/ClientAdapter.h b/cpp/src/client/ClientAdapter.h
index d5e16fc6ad..ca029a793f 100644
--- a/cpp/lib/client/ClientAdapter.h
+++ b/cpp/src/client/ClientAdapter.h
@@ -19,7 +19,7 @@
*
*/
-#include "ChannelAdapter.h"
+#include "../framing/ChannelAdapter.h"
#include "ClientChannel.h"
namespace qpid {
diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/src/client/ClientChannel.cpp
index 98feff9389..eda872fc30 100644
--- a/cpp/lib/client/ClientChannel.cpp
+++ b/cpp/src/client/ClientChannel.cpp
@@ -19,11 +19,11 @@
*
*/
#include <iostream>
-#include <ClientChannel.h>
-#include <sys/Monitor.h>
-#include <ClientMessage.h>
-#include <QpidError.h>
-#include <MethodBodyInstances.h>
+#include "ClientChannel.h"
+#include "../sys/Monitor.h"
+#include "ClientMessage.h"
+#include "../QpidError.h"
+#include "MethodBodyInstances.h"
#include "Connection.h"
#include "BasicMessageChannel.h"
// FIXME aconway 2007-03-21:
diff --git a/cpp/lib/client/ClientChannel.h b/cpp/src/client/ClientChannel.h
index f6fe18da20..a7e0d2ec31 100644
--- a/cpp/lib/client/ClientChannel.h
+++ b/cpp/src/client/ClientChannel.h
@@ -22,13 +22,13 @@
*
*/
#include <boost/scoped_ptr.hpp>
-#include <framing/amqp_framing.h>
-#include <ClientExchange.h>
-#include <ClientMessage.h>
-#include <ClientQueue.h>
-#include <ResponseHandler.h>
-#include "ChannelAdapter.h"
-#include "Thread.h"
+#include "../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 "AckMode.h"
namespace qpid {
diff --git a/cpp/lib/client/ClientExchange.cpp b/cpp/src/client/ClientExchange.cpp
index 5e5f3f14c6..d5914beea2 100644
--- a/cpp/lib/client/ClientExchange.cpp
+++ b/cpp/src/client/ClientExchange.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <ClientExchange.h>
+#include "ClientExchange.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; }
diff --git a/cpp/lib/client/ClientExchange.h b/cpp/src/client/ClientExchange.h
index a8ac21fa9b..a8ac21fa9b 100644
--- a/cpp/lib/client/ClientExchange.h
+++ b/cpp/src/client/ClientExchange.h
diff --git a/cpp/lib/client/ClientMessage.h b/cpp/src/client/ClientMessage.h
index a326c24aed..dc25b4070b 100644
--- a/cpp/lib/client/ClientMessage.h
+++ b/cpp/src/client/ClientMessage.h
@@ -22,7 +22,7 @@
*
*/
#include <string>
-#include "framing/BasicHeaderProperties.h"
+#include "../framing/BasicHeaderProperties.h"
namespace qpid {
namespace client {
diff --git a/cpp/lib/client/ClientQueue.cpp b/cpp/src/client/ClientQueue.cpp
index 773be504d8..613cf8d288 100644
--- a/cpp/lib/client/ClientQueue.cpp
+++ b/cpp/src/client/ClientQueue.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <ClientQueue.h>
+#include "ClientQueue.h"
qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true), durable(false){}
diff --git a/cpp/lib/client/ClientQueue.h b/cpp/src/client/ClientQueue.h
index b37a44b004..b37a44b004 100644
--- a/cpp/lib/client/ClientQueue.h
+++ b/cpp/src/client/ClientQueue.h
diff --git a/cpp/lib/client/Connection.cpp b/cpp/src/client/Connection.cpp
index 618f3cbc92..365311ab37 100644
--- a/cpp/lib/client/Connection.cpp
+++ b/cpp/src/client/Connection.cpp
@@ -22,13 +22,13 @@
#include <boost/format.hpp>
#include <boost/bind.hpp>
-#include <Connection.h>
-#include <ClientChannel.h>
-#include <ClientMessage.h>
-#include <QpidError.h>
+#include "Connection.h"
+#include "ClientChannel.h"
+#include "ClientMessage.h"
+#include "../QpidError.h"
#include <iostream>
#include <sstream>
-#include <MethodBodyInstances.h>
+#include "MethodBodyInstances.h"
#include <functional>
using namespace qpid::framing;
diff --git a/cpp/lib/client/Connection.h b/cpp/src/client/Connection.h
index 627266e580..5e0b413dac 100644
--- a/cpp/lib/client/Connection.h
+++ b/cpp/src/client/Connection.h
@@ -23,11 +23,11 @@
*/
#include <map>
#include <string>
-#include "QpidError.h"
+#include "../QpidError.h"
#include "ClientChannel.h"
#include "Connector.h"
-#include "sys/ShutdownHandler.h"
-#include "sys/TimeoutHandler.h"
+#include "../sys/ShutdownHandler.h"
+#include "../sys/TimeoutHandler.h"
namespace qpid {
diff --git a/cpp/lib/client/Connector.cpp b/cpp/src/client/Connector.cpp
index 7b73cc016a..566e58ec13 100644
--- a/cpp/lib/client/Connector.cpp
+++ b/cpp/src/client/Connector.cpp
@@ -19,8 +19,8 @@
*
*/
#include <iostream>
-#include <QpidError.h>
-#include <sys/Time.h>
+#include "../QpidError.h"
+#include "../sys/Time.h"
#include "Connector.h"
namespace qpid {
diff --git a/cpp/lib/client/Connector.h b/cpp/src/client/Connector.h
index 91234d2321..928bfa2d14 100644
--- a/cpp/lib/client/Connector.h
+++ b/cpp/src/client/Connector.h
@@ -22,16 +22,16 @@
#define _Connector_
-#include <framing/InputHandler.h>
-#include <framing/OutputHandler.h>
-#include <framing/InitiationHandler.h>
-#include <framing/ProtocolInitiation.h>
-#include <ProtocolVersion.h>
-#include <sys/ShutdownHandler.h>
-#include <sys/TimeoutHandler.h>
-#include <sys/Thread.h>
-#include <sys/Monitor.h>
-#include <sys/Socket.h>
+#include "../framing/InputHandler.h"
+#include "../framing/OutputHandler.h"
+#include "../framing/InitiationHandler.h"
+#include "../framing/ProtocolInitiation.h"
+#include "../framing/ProtocolVersion.h"
+#include "../sys/ShutdownHandler.h"
+#include "../sys/TimeoutHandler.h"
+#include "../sys/Thread.h"
+#include "../sys/Monitor.h"
+#include "../sys/Socket.h"
namespace qpid {
diff --git a/cpp/lib/client/IncomingMessage.cpp b/cpp/src/client/IncomingMessage.cpp
index fb9640b61b..05c4bc2378 100644
--- a/cpp/lib/client/IncomingMessage.cpp
+++ b/cpp/src/client/IncomingMessage.cpp
@@ -20,7 +20,7 @@
*/
#include "IncomingMessage.h"
-#include "Exception.h"
+#include "../Exception.h"
#include "ClientMessage.h"
#include <boost/format.hpp>
diff --git a/cpp/lib/client/IncomingMessage.h b/cpp/src/client/IncomingMessage.h
index d78a90327d..b01bd3eedc 100644
--- a/cpp/lib/client/IncomingMessage.h
+++ b/cpp/src/client/IncomingMessage.h
@@ -21,7 +21,7 @@
* under the License.
*
*/
-#include "sys/Mutex.h"
+#include "../sys/Mutex.h"
#include <map>
#include <vector>
diff --git a/cpp/lib/client/Makefile.am b/cpp/src/client/Makefile.am
index 6dbe195232..4a98c3f539 100644
--- a/cpp/lib/client/Makefile.am
+++ b/cpp/src/client/Makefile.am
@@ -1,13 +1,10 @@
AM_CXXFLAGS = $(WARNING_CFLAGS)
INCLUDES = \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing \
+ -I$(srcdir)/../gen \
$(APR_CXXFLAGS)
lib_LTLIBRARIES = libqpidclient.la
-libqpidclient_la_LIBADD = ../common/libqpidcommon.la
+libqpidclient_la_LIBADD = ../libqpidcommon.la
libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
libqpidclient_la_SOURCES = \
ClientChannel.cpp \
diff --git a/cpp/lib/client/MessageChannel.h b/cpp/src/client/MessageChannel.h
index 028a19a949..2fa387b7f7 100644
--- a/cpp/lib/client/MessageChannel.h
+++ b/cpp/src/client/MessageChannel.h
@@ -19,8 +19,8 @@
*
*/
-#include "shared_ptr.h"
-#include "sys/Runnable.h"
+#include "../shared_ptr.h"
+#include "../sys/Runnable.h"
#include "AckMode.h"
namespace qpid {
diff --git a/cpp/lib/client/MessageListener.cpp b/cpp/src/client/MessageListener.cpp
index 70d44e7040..68ebedeb0d 100644
--- a/cpp/lib/client/MessageListener.cpp
+++ b/cpp/src/client/MessageListener.cpp
@@ -19,6 +19,6 @@
*
*/
-#include <MessageListener.h>
+#include "MessageListener.h"
qpid::client::MessageListener::~MessageListener() {}
diff --git a/cpp/lib/client/MessageListener.h b/cpp/src/client/MessageListener.h
index cfb917b4f8..501862a3ef 100644
--- a/cpp/lib/client/MessageListener.h
+++ b/cpp/src/client/MessageListener.h
@@ -23,7 +23,7 @@
#ifndef _MessageListener_
#define _MessageListener_
-#include <ClientMessage.h>
+#include "ClientMessage.h"
namespace qpid {
namespace client {
diff --git a/cpp/lib/client/MethodBodyInstances.h b/cpp/src/client/MethodBodyInstances.h
index acbeeb1158..57b9bf73ce 100644
--- a/cpp/lib/client/MethodBodyInstances.h
+++ b/cpp/src/client/MethodBodyInstances.h
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <framing/amqp_framing.h>
+#include "../framing/amqp_framing.h"
#ifndef _MethodBodyInstances_h_
#define _MethodBodyInstances_h_
diff --git a/cpp/lib/client/ResponseHandler.cpp b/cpp/src/client/ResponseHandler.cpp
index 926a9ce336..ca0129d587 100644
--- a/cpp/lib/client/ResponseHandler.cpp
+++ b/cpp/src/client/ResponseHandler.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <QpidError.h>
+#include "../QpidError.h"
#include <boost/format.hpp>
#include "ResponseHandler.h"
-#include "AMQMethodBody.h"
+#include "../framing/AMQMethodBody.h"
using namespace qpid::sys;
using namespace qpid::framing;
diff --git a/cpp/lib/client/ResponseHandler.h b/cpp/src/client/ResponseHandler.h
index 500166144d..289a5dd994 100644
--- a/cpp/lib/client/ResponseHandler.h
+++ b/cpp/src/client/ResponseHandler.h
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "shared_ptr.h"
-#include <sys/Monitor.h>
+#include "../shared_ptr.h"
+#include "../sys/Monitor.h"
#ifndef _ResponseHandler_
#define _ResponseHandler_
diff --git a/cpp/lib/client/ReturnedMessageHandler.cpp b/cpp/src/client/ReturnedMessageHandler.cpp
index ee9f7462ef..35d0b5c0a8 100644
--- a/cpp/lib/client/ReturnedMessageHandler.cpp
+++ b/cpp/src/client/ReturnedMessageHandler.cpp
@@ -19,6 +19,6 @@
*
*/
-#include <ReturnedMessageHandler.h>
+#include "ReturnedMessageHandler.h"
qpid::client::ReturnedMessageHandler::~ReturnedMessageHandler() {}
diff --git a/cpp/lib/client/ReturnedMessageHandler.h b/cpp/src/client/ReturnedMessageHandler.h
index 137f0b2e17..8b42fc0764 100644
--- a/cpp/lib/client/ReturnedMessageHandler.h
+++ b/cpp/src/client/ReturnedMessageHandler.h
@@ -23,7 +23,7 @@
#ifndef _ReturnedMessageHandler_
#define _ReturnedMessageHandler_
-#include <ClientMessage.h>
+#include "ClientMessage.h"
namespace qpid {
namespace client {
diff --git a/cpp/lib/common/doxygen_mainpage.h b/cpp/src/doxygen_mainpage.h
index b354238cd0..b354238cd0 100644
--- a/cpp/lib/common/doxygen_mainpage.h
+++ b/cpp/src/doxygen_mainpage.h
diff --git a/cpp/lib/common/framing/AMQBody.cpp b/cpp/src/framing/AMQBody.cpp
index c7c253beda..a64d224a86 100644
--- a/cpp/lib/common/framing/AMQBody.cpp
+++ b/cpp/src/framing/AMQBody.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <AMQBody.h>
+#include "AMQBody.h"
#include <iostream>
std::ostream& qpid::framing::operator<<(std::ostream& out, const qpid::framing::AMQBody& body)
diff --git a/cpp/lib/common/framing/AMQBody.h b/cpp/src/framing/AMQBody.h
index 26076956ca..eaa568c06a 100644
--- a/cpp/lib/common/framing/AMQBody.h
+++ b/cpp/src/framing/AMQBody.h
@@ -19,8 +19,8 @@
*
*/
#include <boost/shared_ptr.hpp>
-#include <amqp_types.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "Buffer.h"
#ifndef _AMQBody_
#define _AMQBody_
diff --git a/cpp/lib/common/framing/AMQContentBody.cpp b/cpp/src/framing/AMQContentBody.cpp
index 573c17dade..19d2e5714a 100644
--- a/cpp/lib/common/framing/AMQContentBody.cpp
+++ b/cpp/src/framing/AMQContentBody.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <AMQContentBody.h>
+#include "AMQContentBody.h"
#include <iostream>
qpid::framing::AMQContentBody::AMQContentBody(){
diff --git a/cpp/lib/common/framing/AMQContentBody.h b/cpp/src/framing/AMQContentBody.h
index c9fa7cde5c..6d4c1ef4b6 100644
--- a/cpp/lib/common/framing/AMQContentBody.h
+++ b/cpp/src/framing/AMQContentBody.h
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
#ifndef _AMQContentBody_
#define _AMQContentBody_
diff --git a/cpp/lib/common/framing/AMQDataBlock.h b/cpp/src/framing/AMQDataBlock.h
index 2a6f843f1e..6ff61b185e 100644
--- a/cpp/lib/common/framing/AMQDataBlock.h
+++ b/cpp/src/framing/AMQDataBlock.h
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <Buffer.h>
+#include "Buffer.h"
#ifndef _AMQDataBlock_
#define _AMQDataBlock_
diff --git a/cpp/lib/common/framing/AMQFrame.cpp b/cpp/src/framing/AMQFrame.cpp
index bc9061b169..8b79286107 100644
--- a/cpp/lib/common/framing/AMQFrame.cpp
+++ b/cpp/src/framing/AMQFrame.cpp
@@ -21,8 +21,8 @@
*/
#include <boost/format.hpp>
-#include <AMQFrame.h>
-#include <QpidError.h>
+#include "AMQFrame.h"
+#include "../QpidError.h"
#include "AMQRequestBody.h"
#include "AMQResponseBody.h"
diff --git a/cpp/lib/common/framing/AMQFrame.h b/cpp/src/framing/AMQFrame.h
index 0c18e0c2a5..d4c2e0640d 100644
--- a/cpp/lib/common/framing/AMQFrame.h
+++ b/cpp/src/framing/AMQFrame.h
@@ -23,16 +23,16 @@
*/
#include <boost/cast.hpp>
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <AMQDataBlock.h>
-#include <AMQMethodBody.h>
-#include <AMQHeaderBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeartbeatBody.h>
-#include <AMQP_MethodVersionMap.h>
-#include <AMQP_HighestVersion.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "AMQDataBlock.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "AMQP_MethodVersionMap.h"
+#include "AMQP_HighestVersion.h"
+#include "Buffer.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/AMQHeaderBody.cpp b/cpp/src/framing/AMQHeaderBody.cpp
index 3ddae4eebf..fccffd006c 100644
--- a/cpp/lib/common/framing/AMQHeaderBody.cpp
+++ b/cpp/src/framing/AMQHeaderBody.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <AMQHeaderBody.h>
-#include <QpidError.h>
-#include <BasicHeaderProperties.h>
+#include "AMQHeaderBody.h"
+#include "../QpidError.h"
+#include "BasicHeaderProperties.h"
qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
createProperties(classId);
diff --git a/cpp/lib/common/framing/AMQHeaderBody.h b/cpp/src/framing/AMQHeaderBody.h
index d57f93aacd..691ceeff73 100644
--- a/cpp/lib/common/framing/AMQHeaderBody.h
+++ b/cpp/src/framing/AMQHeaderBody.h
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
-#include <HeaderProperties.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+#include "HeaderProperties.h"
#ifndef _AMQHeaderBody_
#define _AMQHeaderBody_
diff --git a/cpp/lib/common/framing/AMQHeartbeatBody.cpp b/cpp/src/framing/AMQHeartbeatBody.cpp
index 63f83a3d29..140ce2e794 100644
--- a/cpp/lib/common/framing/AMQHeartbeatBody.cpp
+++ b/cpp/src/framing/AMQHeartbeatBody.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <AMQHeartbeatBody.h>
+#include "AMQHeartbeatBody.h"
#include <iostream>
qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {}
diff --git a/cpp/lib/common/framing/AMQHeartbeatBody.h b/cpp/src/framing/AMQHeartbeatBody.h
index a3e9d823f1..4c046b81a7 100644
--- a/cpp/lib/common/framing/AMQHeartbeatBody.h
+++ b/cpp/src/framing/AMQHeartbeatBody.h
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
#ifndef _AMQHeartbeatBody_
#define _AMQHeartbeatBody_
diff --git a/cpp/lib/common/framing/AMQMethodBody.cpp b/cpp/src/framing/AMQMethodBody.cpp
index 23502068f5..44924b76e1 100644
--- a/cpp/lib/common/framing/AMQMethodBody.cpp
+++ b/cpp/src/framing/AMQMethodBody.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <AMQFrame.h>
-#include <AMQMethodBody.h>
-#include <QpidError.h>
+#include "AMQFrame.h"
+#include "AMQMethodBody.h"
+#include "../QpidError.h"
#include "AMQP_MethodVersionMap.h"
namespace qpid {
diff --git a/cpp/lib/common/framing/AMQMethodBody.h b/cpp/src/framing/AMQMethodBody.h
index c2b00c2169..c5f0a1adf7 100644
--- a/cpp/lib/common/framing/AMQMethodBody.h
+++ b/cpp/src/framing/AMQMethodBody.h
@@ -22,11 +22,11 @@
*
*/
#include <iostream>
-#include <amqp_types.h>
-#include <AMQBody.h>
-#include <Buffer.h>
-#include <AMQP_ServerOperations.h>
-#include <MethodContext.h>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+#include "AMQP_ServerOperations.h"
+#include "MethodContext.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/AMQRequestBody.cpp b/cpp/src/framing/AMQRequestBody.cpp
index 54e1c11863..54e1c11863 100644
--- a/cpp/lib/common/framing/AMQRequestBody.cpp
+++ b/cpp/src/framing/AMQRequestBody.cpp
diff --git a/cpp/lib/common/framing/AMQRequestBody.h b/cpp/src/framing/AMQRequestBody.h
index f21659a57a..f21659a57a 100644
--- a/cpp/lib/common/framing/AMQRequestBody.h
+++ b/cpp/src/framing/AMQRequestBody.h
diff --git a/cpp/lib/common/framing/AMQResponseBody.cpp b/cpp/src/framing/AMQResponseBody.cpp
index 7da71a5d25..7da71a5d25 100644
--- a/cpp/lib/common/framing/AMQResponseBody.cpp
+++ b/cpp/src/framing/AMQResponseBody.cpp
diff --git a/cpp/lib/common/framing/AMQResponseBody.h b/cpp/src/framing/AMQResponseBody.h
index fa381baddd..fa381baddd 100644
--- a/cpp/lib/common/framing/AMQResponseBody.h
+++ b/cpp/src/framing/AMQResponseBody.h
diff --git a/cpp/lib/common/framing/BasicHeaderProperties.cpp b/cpp/src/framing/BasicHeaderProperties.cpp
index d815d1e62f..dfa5e1bc3f 100644
--- a/cpp/lib/common/framing/BasicHeaderProperties.cpp
+++ b/cpp/src/framing/BasicHeaderProperties.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <BasicHeaderProperties.h>
+#include "BasicHeaderProperties.h"
//TODO: This could be easily generated from the spec
diff --git a/cpp/lib/common/framing/BasicHeaderProperties.h b/cpp/src/framing/BasicHeaderProperties.h
index 248014aefb..a6347b37fd 100644
--- a/cpp/lib/common/framing/BasicHeaderProperties.h
+++ b/cpp/src/framing/BasicHeaderProperties.h
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <Buffer.h>
-#include <FieldTable.h>
-#include <HeaderProperties.h>
+#include "amqp_types.h"
+#include "Buffer.h"
+#include "FieldTable.h"
+#include "HeaderProperties.h"
#ifndef _BasicHeaderProperties_
#define _BasicHeaderProperties_
diff --git a/cpp/lib/common/framing/BodyHandler.cpp b/cpp/src/framing/BodyHandler.cpp
index 5dd0c0c23d..3b389fb5ec 100644
--- a/cpp/lib/common/framing/BodyHandler.cpp
+++ b/cpp/src/framing/BodyHandler.cpp
@@ -18,14 +18,14 @@
* under the License.
*
*/
-#include "QpidError.h"
+#include "../QpidError.h"
#include "BodyHandler.h"
-#include <AMQRequestBody.h>
-#include <AMQResponseBody.h>
-#include <AMQMethodBody.h>
-#include <AMQHeaderBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeartbeatBody.h>
+#include "AMQRequestBody.h"
+#include "AMQResponseBody.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
using namespace qpid::framing;
using namespace boost;
diff --git a/cpp/lib/common/framing/BodyHandler.h b/cpp/src/framing/BodyHandler.h
index cb3f0997b0..cb3f0997b0 100644
--- a/cpp/lib/common/framing/BodyHandler.h
+++ b/cpp/src/framing/BodyHandler.h
diff --git a/cpp/lib/common/framing/Buffer.cpp b/cpp/src/framing/Buffer.cpp
index 52c9a42d55..2a14e854d0 100644
--- a/cpp/lib/common/framing/Buffer.cpp
+++ b/cpp/src/framing/Buffer.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <Buffer.h>
-#include <FramingContent.h>
-#include <FieldTable.h>
+#include "Buffer.h"
+#include "FramingContent.h"
+#include "FieldTable.h"
qpid::framing::Buffer::Buffer(uint32_t _size) : size(_size), owner(true), position(0), limit(_size){
data = new char[size];
diff --git a/cpp/lib/common/framing/Buffer.h b/cpp/src/framing/Buffer.h
index 63a15c7c3d..e1a3fb065a 100644
--- a/cpp/lib/common/framing/Buffer.h
+++ b/cpp/src/framing/Buffer.h
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <amqp_types.h>
+#include "amqp_types.h"
#ifndef _Buffer_
#define _Buffer_
diff --git a/cpp/lib/common/framing/ChannelAdapter.cpp b/cpp/src/framing/ChannelAdapter.cpp
index 8a1ff39ee5..99a14f08fb 100644
--- a/cpp/lib/common/framing/ChannelAdapter.cpp
+++ b/cpp/src/framing/ChannelAdapter.cpp
@@ -19,7 +19,7 @@
#include "ChannelAdapter.h"
#include "AMQFrame.h"
-#include "Exception.h"
+#include "../Exception.h"
using boost::format;
diff --git a/cpp/lib/common/framing/ChannelAdapter.h b/cpp/src/framing/ChannelAdapter.h
index f6e3986eed..493191d92b 100644
--- a/cpp/lib/common/framing/ChannelAdapter.h
+++ b/cpp/src/framing/ChannelAdapter.h
@@ -27,7 +27,7 @@
#include "BodyHandler.h"
#include "Requester.h"
#include "Responder.h"
-#include "framing/amqp_types.h"
+#include "amqp_types.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/FieldTable.cpp b/cpp/src/framing/FieldTable.cpp
index 5bbc4651d3..c4881a7c94 100644
--- a/cpp/lib/common/framing/FieldTable.cpp
+++ b/cpp/src/framing/FieldTable.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <FieldTable.h>
-#include <QpidError.h>
-#include <Buffer.h>
-#include <Value.h>
+#include "FieldTable.h"
+#include "../QpidError.h"
+#include "Buffer.h"
+#include "Value.h"
#include <assert.h>
namespace qpid {
diff --git a/cpp/lib/common/framing/FieldTable.h b/cpp/src/framing/FieldTable.h
index e25a7d3f8c..2be3e6d3ff 100644
--- a/cpp/lib/common/framing/FieldTable.h
+++ b/cpp/src/framing/FieldTable.h
@@ -22,7 +22,7 @@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <map>
-#include <amqp_types.h>
+#include "amqp_types.h"
#ifndef _FieldTable_
#define _FieldTable_
diff --git a/cpp/lib/common/framing/FramingContent.cpp b/cpp/src/framing/FramingContent.cpp
index 24efa38dcb..1f8f77d129 100644
--- a/cpp/lib/common/framing/FramingContent.cpp
+++ b/cpp/src/framing/FramingContent.cpp
@@ -22,7 +22,7 @@
#include "Buffer.h"
#include "FramingContent.h"
-#include <QpidError.h>
+#include "../QpidError.h"
#include <sstream>
namespace qpid {
diff --git a/cpp/lib/common/framing/FramingContent.h b/cpp/src/framing/FramingContent.h
index 876e90c905..876e90c905 100644
--- a/cpp/lib/common/framing/FramingContent.h
+++ b/cpp/src/framing/FramingContent.h
diff --git a/cpp/lib/common/framing/HeaderProperties.h b/cpp/src/framing/HeaderProperties.h
index 1ec4840309..ae8b796aa9 100644
--- a/cpp/lib/common/framing/HeaderProperties.h
+++ b/cpp/src/framing/HeaderProperties.h
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <Buffer.h>
+#include "amqp_types.h"
+#include "Buffer.h"
#ifndef _HeaderProperties_
#define _HeaderProperties_
diff --git a/cpp/lib/common/framing/InitiationHandler.cpp b/cpp/src/framing/InitiationHandler.cpp
index dd92c9859b..eceeaf4abc 100644
--- a/cpp/lib/common/framing/InitiationHandler.cpp
+++ b/cpp/src/framing/InitiationHandler.cpp
@@ -19,6 +19,6 @@
*
*/
-#include <InitiationHandler.h>
+#include "InitiationHandler.h"
qpid::framing::InitiationHandler::~InitiationHandler() {}
diff --git a/cpp/lib/common/framing/InitiationHandler.h b/cpp/src/framing/InitiationHandler.h
index 7f44323f09..16a6b502e8 100644
--- a/cpp/lib/common/framing/InitiationHandler.h
+++ b/cpp/src/framing/InitiationHandler.h
@@ -23,7 +23,7 @@
#ifndef _InitiationHandler_
#define _InitiationHandler_
-#include <ProtocolInitiation.h>
+#include "ProtocolInitiation.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/InputHandler.h b/cpp/src/framing/InputHandler.h
index 4e2d4bcc9b..dc6814b849 100644
--- a/cpp/lib/common/framing/InputHandler.h
+++ b/cpp/src/framing/InputHandler.h
@@ -21,7 +21,7 @@
*
*/
-#include <AMQFrame.h>
+#include "AMQFrame.h"
#include <boost/noncopyable.hpp>
namespace qpid {
diff --git a/cpp/lib/common/framing/MethodContext.cpp b/cpp/src/framing/MethodContext.cpp
index 73af73f8e5..73af73f8e5 100644
--- a/cpp/lib/common/framing/MethodContext.cpp
+++ b/cpp/src/framing/MethodContext.cpp
diff --git a/cpp/lib/common/framing/MethodContext.h b/cpp/src/framing/MethodContext.h
index 80e4c55d7e..80e4c55d7e 100644
--- a/cpp/lib/common/framing/MethodContext.h
+++ b/cpp/src/framing/MethodContext.h
diff --git a/cpp/lib/common/framing/OutputHandler.h b/cpp/src/framing/OutputHandler.h
index 9ffd4227d8..9ffd4227d8 100644
--- a/cpp/lib/common/framing/OutputHandler.h
+++ b/cpp/src/framing/OutputHandler.h
diff --git a/cpp/lib/common/framing/ProtocolInitiation.cpp b/cpp/src/framing/ProtocolInitiation.cpp
index de53488f7b..a6d1b17f6e 100644
--- a/cpp/lib/common/framing/ProtocolInitiation.cpp
+++ b/cpp/src/framing/ProtocolInitiation.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <ProtocolInitiation.h>
+#include "ProtocolInitiation.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/ProtocolInitiation.h b/cpp/src/framing/ProtocolInitiation.h
index ed7b59e94e..adfdc8215d 100644
--- a/cpp/lib/common/framing/ProtocolInitiation.h
+++ b/cpp/src/framing/ProtocolInitiation.h
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <Buffer.h>
-#include <AMQDataBlock.h>
-#include <ProtocolVersion.h>
+#include "amqp_types.h"
+#include "Buffer.h"
+#include "AMQDataBlock.h"
+#include "ProtocolVersion.h"
#ifndef _ProtocolInitiation_
#define _ProtocolInitiation_
diff --git a/cpp/lib/common/framing/ProtocolVersion.cpp b/cpp/src/framing/ProtocolVersion.cpp
index fd4b1a645f..7a96bfa925 100644
--- a/cpp/lib/common/framing/ProtocolVersion.cpp
+++ b/cpp/src/framing/ProtocolVersion.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <ProtocolVersion.h>
+#include "ProtocolVersion.h"
#include <sstream>
using namespace qpid::framing;
diff --git a/cpp/lib/common/framing/ProtocolVersion.h b/cpp/src/framing/ProtocolVersion.h
index 5e1429c1ea..a2a755397b 100644
--- a/cpp/lib/common/framing/ProtocolVersion.h
+++ b/cpp/src/framing/ProtocolVersion.h
@@ -21,7 +21,7 @@
#ifndef _ProtocolVersion_
#define _ProtocolVersion_
-#include <amqp_types.h>
+#include "amqp_types.h"
namespace qpid
{
diff --git a/cpp/lib/common/framing/ProtocolVersionException.cpp b/cpp/src/framing/ProtocolVersionException.cpp
index 9088422f6f..b68b3af1f9 100644
--- a/cpp/lib/common/framing/ProtocolVersionException.cpp
+++ b/cpp/src/framing/ProtocolVersionException.cpp
@@ -19,7 +19,7 @@
*
*/
#include <boost/format.hpp>
-#include <ProtocolVersionException.h>
+#include "ProtocolVersionException.h"
using namespace qpid::framing;
diff --git a/cpp/lib/common/framing/ProtocolVersionException.h b/cpp/src/framing/ProtocolVersionException.h
index 8e2de8b843..0186ed7441 100644
--- a/cpp/lib/common/framing/ProtocolVersionException.h
+++ b/cpp/src/framing/ProtocolVersionException.h
@@ -22,8 +22,8 @@
#ifndef _ProtocolVersionException_
#define _ProtocolVersionException_
-#include <Exception.h>
-#include <ProtocolVersion.h>
+#include "../Exception.h"
+#include "ProtocolVersion.h"
#include <string>
#include <vector>
diff --git a/cpp/lib/common/framing/Proxy.cpp b/cpp/src/framing/Proxy.cpp
index 0b2a882a49..0b2a882a49 100644
--- a/cpp/lib/common/framing/Proxy.cpp
+++ b/cpp/src/framing/Proxy.cpp
diff --git a/cpp/lib/common/framing/Proxy.h b/cpp/src/framing/Proxy.h
index 8ed46ed748..8ed46ed748 100644
--- a/cpp/lib/common/framing/Proxy.h
+++ b/cpp/src/framing/Proxy.h
diff --git a/cpp/lib/common/framing/Requester.cpp b/cpp/src/framing/Requester.cpp
index 9ee809e2ee..42cf4c392f 100644
--- a/cpp/lib/common/framing/Requester.cpp
+++ b/cpp/src/framing/Requester.cpp
@@ -19,7 +19,7 @@
#include <boost/format.hpp>
#include "Requester.h"
-#include "QpidError.h"
+#include "../QpidError.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/Requester.h b/cpp/src/framing/Requester.h
index dcc4460041..dcc4460041 100644
--- a/cpp/lib/common/framing/Requester.h
+++ b/cpp/src/framing/Requester.h
diff --git a/cpp/lib/common/framing/Responder.cpp b/cpp/src/framing/Responder.cpp
index c8c5ce8dcc..e8c8135387 100644
--- a/cpp/lib/common/framing/Responder.cpp
+++ b/cpp/src/framing/Responder.cpp
@@ -18,7 +18,7 @@
#include <boost/format.hpp>
#include "Responder.h"
-#include "QpidError.h"
+#include "../QpidError.h"
namespace qpid {
namespace framing {
diff --git a/cpp/lib/common/framing/Responder.h b/cpp/src/framing/Responder.h
index 0e1785256b..0e1785256b 100644
--- a/cpp/lib/common/framing/Responder.h
+++ b/cpp/src/framing/Responder.h
diff --git a/cpp/lib/common/framing/Value.cpp b/cpp/src/framing/Value.cpp
index 03e005e384..b5016f3dd0 100644
--- a/cpp/lib/common/framing/Value.cpp
+++ b/cpp/src/framing/Value.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <Value.h>
-#include <Buffer.h>
-#include <FieldTable.h>
-#include <QpidError.h>
+#include "Value.h"
+#include "Buffer.h"
+#include "FieldTable.h"
+#include "../QpidError.h"
#include <sstream>
namespace qpid {
diff --git a/cpp/lib/common/framing/Value.h b/cpp/src/framing/Value.h
index 8752b02f40..a6cff8ec88 100644
--- a/cpp/lib/common/framing/Value.h
+++ b/cpp/src/framing/Value.h
@@ -20,8 +20,8 @@
*/
#include <iostream>
#include <vector>
-#include <amqp_types.h>
-#include <FieldTable.h>
+#include "amqp_types.h"
+#include "FieldTable.h"
#ifndef _Value_
#define _Value_
diff --git a/cpp/lib/common/framing/amqp_framing.h b/cpp/src/framing/amqp_framing.h
index 62f87352f8..5cbaedb102 100644
--- a/cpp/lib/common/framing/amqp_framing.h
+++ b/cpp/src/framing/amqp_framing.h
@@ -18,19 +18,19 @@
* under the License.
*
*/
-#include <amqp_types.h>
-#include <AMQFrame.h>
-#include <AMQBody.h>
-#include <BodyHandler.h>
-#include <AMQMethodBody.h>
-#include <AMQHeaderBody.h>
-#include <AMQContentBody.h>
-#include <AMQHeartbeatBody.h>
-#include <AMQP_MethodVersionMap.h>
-#include <InputHandler.h>
-#include <OutputHandler.h>
-#include <InitiationHandler.h>
-#include <ProtocolInitiation.h>
-#include <BasicHeaderProperties.h>
-#include <ProtocolVersion.h>
-#include <ProtocolVersionException.h>
+#include "amqp_types.h"
+#include "AMQFrame.h"
+#include "AMQBody.h"
+#include "BodyHandler.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "AMQP_MethodVersionMap.h"
+#include "InputHandler.h"
+#include "OutputHandler.h"
+#include "InitiationHandler.h"
+#include "ProtocolInitiation.h"
+#include "BasicHeaderProperties.h"
+#include "ProtocolVersion.h"
+#include "ProtocolVersionException.h"
diff --git a/cpp/lib/common/framing/amqp_types.h b/cpp/src/framing/amqp_types.h
index 49963bd570..f0bd0ce427 100644
--- a/cpp/lib/common/framing/amqp_types.h
+++ b/cpp/src/framing/amqp_types.h
@@ -35,7 +35,7 @@ typedef unsigned int uint32_t;
typedef unsigned __int64 uint64_t;
#endif
#ifndef _WINDOWS
-#include "stdint.h"
+#include <stdint.h>
#endif
namespace qpid {
diff --git a/cpp/lib/common/framing/amqp_types_full.h b/cpp/src/framing/amqp_types_full.h
index 6a24a99d38..6a24a99d38 100644
--- a/cpp/lib/common/framing/amqp_types_full.h
+++ b/cpp/src/framing/amqp_types_full.h
diff --git a/cpp/gen/Makefile.am b/cpp/src/gen/Makefile.am
index e16923fcc2..470000092c 100644
--- a/cpp/gen/Makefile.am
+++ b/cpp/src/gen/Makefile.am
@@ -14,8 +14,8 @@ DISTCLEANFILES = $(BUILT_SOURCES) timestamp gen-src.mk
#
if CAN_GENERATE_CODE
-gentools_dir = $(srcdir)/../gentools
-spec_dir = $(srcdir)/../../specs
+gentools_dir = $(srcdir)/../../gentools
+spec_dir = $(srcdir)/../../../specs
# FIXME aconway 2007-01-04: Enabling Basic class until
# new messaging class is ready to replace it.
diff --git a/cpp/gen/make-gen-src-mk.sh b/cpp/src/gen/make-gen-src-mk.sh
index 08eb8ea134..08eb8ea134 100755
--- a/cpp/gen/make-gen-src-mk.sh
+++ b/cpp/src/gen/make-gen-src-mk.sh
diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index 9f658ebf74..f4d5286f69 100644
--- a/cpp/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
@@ -18,13 +18,13 @@
* under the License.
*
*/
-#include <Broker.h>
-#include <Configuration.h>
+#include "broker/Broker.h"
+#include "broker/Configuration.h"
#include <signal.h>
#include <iostream>
#include <memory>
#include <cerrno>
-#include <config.h>
+#include "../config.h"
#include <unistd.h>
static char const* programName = "qpidd";
diff --git a/cpp/lib/common/shared_ptr.h b/cpp/src/shared_ptr.h
index c4d547e5bb..c4d547e5bb 100644
--- a/cpp/lib/common/shared_ptr.h
+++ b/cpp/src/shared_ptr.h
diff --git a/cpp/lib/common/sys/Acceptor.h b/cpp/src/sys/Acceptor.h
index cd4932d92e..f8edb3cef7 100644
--- a/cpp/lib/common/sys/Acceptor.h
+++ b/cpp/src/sys/Acceptor.h
@@ -23,7 +23,7 @@
*/
#include <stdint.h>
-#include <SharedObject.h>
+#include "../SharedObject.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/AtomicCount.h b/cpp/src/sys/AtomicCount.h
index 63670cbf00..63670cbf00 100644
--- a/cpp/lib/common/sys/AtomicCount.h
+++ b/cpp/src/sys/AtomicCount.h
diff --git a/cpp/lib/common/sys/Condition.h b/cpp/src/sys/Condition.h
index 9d70af5b84..455b179683 100644
--- a/cpp/lib/common/sys/Condition.h
+++ b/cpp/src/sys/Condition.h
@@ -24,11 +24,11 @@
#include <sys/errno.h>
#include <boost/noncopyable.hpp>
-#include <sys/Mutex.h>
-#include <sys/Time.h>
+#include "Mutex.h"
+#include "Time.h"
#ifdef USE_APR
-# include <apr_thread_cond.h>
+#include <apr_thread_cond.h>
#endif
namespace qpid {
diff --git a/cpp/lib/common/sys/ConnectionInputHandler.h b/cpp/src/sys/ConnectionInputHandler.h
index fa70dfaf48..df9bf55f89 100644
--- a/cpp/lib/common/sys/ConnectionInputHandler.h
+++ b/cpp/src/sys/ConnectionInputHandler.h
@@ -21,10 +21,10 @@
#ifndef _ConnectionInputHandler_
#define _ConnectionInputHandler_
-#include <InputHandler.h>
-#include <InitiationHandler.h>
-#include <ProtocolInitiation.h>
-#include <sys/TimeoutHandler.h>
+#include "../framing/InputHandler.h"
+#include "../framing/InitiationHandler.h"
+#include "../framing/ProtocolInitiation.h"
+#include "TimeoutHandler.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/ConnectionInputHandlerFactory.h b/cpp/src/sys/ConnectionInputHandlerFactory.h
index af7d411928..af7d411928 100644
--- a/cpp/lib/common/sys/ConnectionInputHandlerFactory.h
+++ b/cpp/src/sys/ConnectionInputHandlerFactory.h
diff --git a/cpp/lib/common/sys/ConnectionOutputHandler.h b/cpp/src/sys/ConnectionOutputHandler.h
index 91849e1dfb..81bbbd1a17 100644
--- a/cpp/lib/common/sys/ConnectionOutputHandler.h
+++ b/cpp/src/sys/ConnectionOutputHandler.h
@@ -21,7 +21,7 @@
#ifndef _ConnectionOutputHandler_
#define _ConnectionOutputHandler_
-#include <OutputHandler.h>
+#include "../framing/OutputHandler.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/Module.h b/cpp/src/sys/Module.h
index 9bf5d6e1fc..224e1b9c1b 100644
--- a/cpp/lib/common/sys/Module.h
+++ b/cpp/src/sys/Module.h
@@ -23,7 +23,7 @@
*/
#include <boost/noncopyable.hpp>
#include <iostream>
-#include <QpidError.h>
+#include "../QpidError.h"
namespace qpid {
namespace sys {
@@ -99,8 +99,8 @@ template <class T> Module<T>::~Module() throw()
// APR ================================================================
#if USE_APR
-#include <apr/APRBase.h>
-#include <apr/APRPool.h>
+#include "apr/APRBase.h"
+#include "apr/APRPool.h"
template <class T> void Module<T>::load(const std::string& name)
{
diff --git a/cpp/lib/common/sys/Monitor.h b/cpp/src/sys/Monitor.h
index a3bbd3c5aa..1b8ae1a527 100644
--- a/cpp/lib/common/sys/Monitor.h
+++ b/cpp/src/sys/Monitor.h
@@ -23,10 +23,10 @@
*/
#include <sys/errno.h>
-#include <sys/Condition.h>
+#include "Condition.h"
#ifdef USE_APR
-# include <apr_thread_cond.h>
+#include <apr_thread_cond.h>
#endif
namespace qpid {
diff --git a/cpp/lib/common/sys/Mutex.h b/cpp/src/sys/Mutex.h
index 9db9be0981..825b519039 100644
--- a/cpp/lib/common/sys/Mutex.h
+++ b/cpp/src/sys/Mutex.h
@@ -20,12 +20,12 @@
*/
#ifdef USE_APR
-# include <apr_thread_mutex.h>
-# include <apr/APRBase.h>
-# include <apr/APRPool.h>
+#include <apr_thread_mutex.h>
+#include "apr/APRBase.h"
+#include "apr/APRPool.h"
#else
-# include <pthread.h>
-# include <posix/check.h>
+#include <pthread.h>
+#include "posix/check.h"
#endif
#include <boost/noncopyable.hpp>
diff --git a/cpp/lib/common/sys/ProducerConsumer.cpp b/cpp/src/sys/ProducerConsumer.cpp
index 7a0249f666..1cf2a79784 100644
--- a/cpp/lib/common/sys/ProducerConsumer.cpp
+++ b/cpp/src/sys/ProducerConsumer.cpp
@@ -17,7 +17,7 @@
*/
-#include "QpidError.h"
+#include "../QpidError.h"
#include "ScopedIncrement.h"
#include "ProducerConsumer.h"
diff --git a/cpp/lib/common/sys/ProducerConsumer.h b/cpp/src/sys/ProducerConsumer.h
index c7f42f266d..144f4ed600 100644
--- a/cpp/lib/common/sys/ProducerConsumer.h
+++ b/cpp/src/sys/ProducerConsumer.h
@@ -19,8 +19,8 @@
*
*/
#include <boost/noncopyable.hpp>
-#include "Exception.h"
-#include "sys/Monitor.h"
+#include "../Exception.h"
+#include "Monitor.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/Runnable.cpp b/cpp/src/sys/Runnable.cpp
index 30122c682f..30122c682f 100644
--- a/cpp/lib/common/sys/Runnable.cpp
+++ b/cpp/src/sys/Runnable.cpp
diff --git a/cpp/lib/common/sys/Runnable.h b/cpp/src/sys/Runnable.h
index fb3927c612..fb3927c612 100644
--- a/cpp/lib/common/sys/Runnable.h
+++ b/cpp/src/sys/Runnable.h
diff --git a/cpp/lib/common/sys/ScopedIncrement.h b/cpp/src/sys/ScopedIncrement.h
index f14461ddaf..f14461ddaf 100644
--- a/cpp/lib/common/sys/ScopedIncrement.h
+++ b/cpp/src/sys/ScopedIncrement.h
diff --git a/cpp/lib/common/sys/ShutdownHandler.h b/cpp/src/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/cpp/lib/common/sys/ShutdownHandler.h
+++ b/cpp/src/sys/ShutdownHandler.h
diff --git a/cpp/lib/common/sys/Socket.h b/cpp/src/sys/Socket.h
index d793a240c6..ea03222aed 100644
--- a/cpp/lib/common/sys/Socket.h
+++ b/cpp/src/sys/Socket.h
@@ -23,10 +23,10 @@
*/
#include <string>
-#include <sys/Time.h>
+#include "Time.h"
#ifdef USE_APR
-# include <apr_network_io.h>
+#include <apr_network_io.h>
#endif
namespace qpid {
diff --git a/cpp/lib/common/sys/Thread.h b/cpp/src/sys/Thread.h
index 47b95b6234..e52f2a1b3e 100644
--- a/cpp/lib/common/sys/Thread.h
+++ b/cpp/src/sys/Thread.h
@@ -22,16 +22,16 @@
*
*/
-#include <sys/Runnable.h>
+#include "Runnable.h"
#ifdef USE_APR
-# include <apr_thread_proc.h>
-# include <apr_portable.h>
-# include <apr/APRPool.h>
-# include <apr/APRBase.h>
+#include <apr_thread_proc.h>
+#include <apr_portable.h>
+#include "apr/APRPool.h"
+#include "apr/APRBase.h"
#else
-# include <posix/check.h>
-# include <pthread.h>
+#include "posix/check.h"
+#include <pthread.h>
#endif
namespace qpid {
diff --git a/cpp/lib/common/sys/ThreadSafeQueue.h b/cpp/src/sys/ThreadSafeQueue.h
index 80ea92da0e..ce8b0b1bd9 100644
--- a/cpp/lib/common/sys/ThreadSafeQueue.h
+++ b/cpp/src/sys/ThreadSafeQueue.h
@@ -21,7 +21,7 @@
#include <deque>
#include "ProducerConsumer.h"
-#include "Exception.h"
+#include "../Exception.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/Time.cpp b/cpp/src/sys/Time.cpp
index ad6185b966..ad6185b966 100644
--- a/cpp/lib/common/sys/Time.cpp
+++ b/cpp/src/sys/Time.cpp
diff --git a/cpp/lib/common/sys/Time.h b/cpp/src/sys/Time.h
index 3dd46741d8..47609d51df 100644
--- a/cpp/lib/common/sys/Time.h
+++ b/cpp/src/sys/Time.h
@@ -25,9 +25,9 @@
#include <stdint.h>
#ifdef USE_APR
-# include <apr_time.h>
+#include <apr_time.h>
#else
-# include <time.h>
+#include <time.h>
#endif
namespace qpid {
diff --git a/cpp/lib/common/sys/TimeoutHandler.h b/cpp/src/sys/TimeoutHandler.h
index 0c10709bbf..0c10709bbf 100644
--- a/cpp/lib/common/sys/TimeoutHandler.h
+++ b/cpp/src/sys/TimeoutHandler.h
diff --git a/cpp/lib/common/sys/apr/APRAcceptor.cpp b/cpp/src/sys/apr/APRAcceptor.cpp
index 604fb9f5ca..b2535d9e30 100644
--- a/cpp/lib/common/sys/apr/APRAcceptor.cpp
+++ b/cpp/src/sys/apr/APRAcceptor.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <sys/Acceptor.h>
-#include <sys/ConnectionInputHandlerFactory.h>
+#include "../Acceptor.h"
+#include "../ConnectionInputHandlerFactory.h"
#include "LFProcessor.h"
#include "LFSessionContext.h"
#include "APRBase.h"
diff --git a/cpp/lib/common/sys/apr/APRBase.cpp b/cpp/src/sys/apr/APRBase.cpp
index 861071499f..01c8246c91 100644
--- a/cpp/lib/common/sys/apr/APRBase.cpp
+++ b/cpp/src/sys/apr/APRBase.cpp
@@ -19,7 +19,7 @@
*
*/
#include <iostream>
-#include <QpidError.h>
+#include "../../QpidError.h"
#include "APRBase.h"
using namespace qpid::sys;
diff --git a/cpp/lib/common/sys/apr/APRBase.h b/cpp/src/sys/apr/APRBase.h
index 6a866a554a..e9dc085c3b 100644
--- a/cpp/lib/common/sys/apr/APRBase.h
+++ b/cpp/src/sys/apr/APRBase.h
@@ -24,7 +24,7 @@
#include <string>
#include <apr_thread_mutex.h>
#include <apr_errno.h>
-#include <QpidError.h>
+#include "../../QpidError.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/apr/APRPool.cpp b/cpp/src/sys/apr/APRPool.cpp
index e8b71f6e8a..e8b71f6e8a 100644
--- a/cpp/lib/common/sys/apr/APRPool.cpp
+++ b/cpp/src/sys/apr/APRPool.cpp
diff --git a/cpp/lib/common/sys/apr/APRPool.h b/cpp/src/sys/apr/APRPool.h
index da7661fcfa..da7661fcfa 100644
--- a/cpp/lib/common/sys/apr/APRPool.h
+++ b/cpp/src/sys/apr/APRPool.h
diff --git a/cpp/lib/common/sys/apr/APRSocket.cpp b/cpp/src/sys/apr/APRSocket.cpp
index 96dbd132a1..96dbd132a1 100644
--- a/cpp/lib/common/sys/apr/APRSocket.cpp
+++ b/cpp/src/sys/apr/APRSocket.cpp
diff --git a/cpp/lib/common/sys/apr/APRSocket.h b/cpp/src/sys/apr/APRSocket.h
index a55dfc06b0..323500e61a 100644
--- a/cpp/lib/common/sys/apr/APRSocket.h
+++ b/cpp/src/sys/apr/APRSocket.h
@@ -22,7 +22,7 @@
#define _APRSocket_
#include <apr_network_io.h>
-#include <Buffer.h>
+#include "../../framing/Buffer.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/apr/LFProcessor.cpp b/cpp/src/sys/apr/LFProcessor.cpp
index 2b6fc92623..691af97c70 100644
--- a/cpp/lib/common/sys/apr/LFProcessor.cpp
+++ b/cpp/src/sys/apr/LFProcessor.cpp
@@ -19,7 +19,7 @@
*
*/
#include <sstream>
-#include <QpidError.h>
+#include "../../QpidError.h"
#include "LFProcessor.h"
#include "APRBase.h"
#include "LFSessionContext.h"
diff --git a/cpp/lib/common/sys/apr/LFProcessor.h b/cpp/src/sys/apr/LFProcessor.h
index de90199472..62f6536bde 100644
--- a/cpp/lib/common/sys/apr/LFProcessor.h
+++ b/cpp/src/sys/apr/LFProcessor.h
@@ -24,9 +24,9 @@
#include <apr_poll.h>
#include <iostream>
#include <vector>
-#include <sys/Monitor.h>
-#include <sys/Runnable.h>
-#include <sys/Thread.h>
+#include "../Monitor.h"
+#include "../Runnable.h"
+#include "../Thread.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.cpp b/cpp/src/sys/apr/LFSessionContext.cpp
index 5edb72baee..a3616d80a4 100644
--- a/cpp/lib/common/sys/apr/LFSessionContext.cpp
+++ b/cpp/src/sys/apr/LFSessionContext.cpp
@@ -20,7 +20,7 @@
*/
#include "LFSessionContext.h"
#include "APRBase.h"
-#include <QpidError.h>
+#include "../../QpidError.h"
#include <assert.h>
using namespace qpid::sys;
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.h b/cpp/src/sys/apr/LFSessionContext.h
index 81cfc0efda..99aa39bd6e 100644
--- a/cpp/lib/common/sys/apr/LFSessionContext.h
+++ b/cpp/src/sys/apr/LFSessionContext.h
@@ -27,11 +27,11 @@
#include <apr_poll.h>
#include <apr_time.h>
-#include <AMQFrame.h>
-#include <Buffer.h>
-#include <sys/Monitor.h>
-#include <sys/ConnectionOutputHandler.h>
-#include <sys/ConnectionInputHandler.h>
+#include "../../framing/AMQFrame.h"
+#include "../../framing/Buffer.h"
+#include "../Monitor.h"
+#include "../ConnectionOutputHandler.h"
+#include "../ConnectionInputHandler.h"
#include "APRSocket.h"
#include "LFProcessor.h"
diff --git a/cpp/lib/common/sys/apr/Socket.cpp b/cpp/src/sys/apr/Socket.cpp
index bca4da6c96..1b9c980441 100644
--- a/cpp/lib/common/sys/apr/Socket.cpp
+++ b/cpp/src/sys/apr/Socket.cpp
@@ -20,9 +20,9 @@
*/
-#include <sys/Socket.h>
-#include <apr/APRBase.h>
-#include <apr/APRPool.h>
+#include "../Socket.h"
+#include "APRBase.h"
+#include "APRPool.h"
using namespace qpid::sys;
diff --git a/cpp/lib/common/sys/apr/Thread.cpp b/cpp/src/sys/apr/Thread.cpp
index 5c4799aa96..67d2853d9f 100644
--- a/cpp/lib/common/sys/apr/Thread.cpp
+++ b/cpp/src/sys/apr/Thread.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <sys/Thread.h>
+#include "../Thread.h"
using namespace qpid::sys;
using qpid::sys::Runnable;
diff --git a/cpp/lib/common/sys/posix/EventChannel.cpp b/cpp/src/sys/posix/EventChannel.cpp
index 16c7ec9c3f..1d584d6318 100644
--- a/cpp/lib/common/sys/posix/EventChannel.cpp
+++ b/cpp/src/sys/posix/EventChannel.cpp
@@ -31,8 +31,8 @@
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/current_function.hpp>
-#include <QpidError.h>
-#include <sys/Monitor.h>
+#include "../../QpidError.h"
+#include "../Monitor.h"
#include "check.h"
#include "EventChannel.h"
diff --git a/cpp/lib/common/sys/posix/EventChannel.h b/cpp/src/sys/posix/EventChannel.h
index 49c7fce740..4177839d00 100644
--- a/cpp/lib/common/sys/posix/EventChannel.h
+++ b/cpp/src/sys/posix/EventChannel.h
@@ -19,8 +19,8 @@
*
*/
-#include <SharedObject.h>
-#include <ExceptionHolder.h>
+#include "../../SharedObject.h"
+#include "../../ExceptionHolder.h"
#include <boost/function.hpp>
#include <memory>
diff --git a/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp b/cpp/src/sys/posix/EventChannelAcceptor.cpp
index 548fbd1881..94dda99d78 100644
--- a/cpp/lib/common/sys/posix/EventChannelAcceptor.cpp
+++ b/cpp/src/sys/posix/EventChannelAcceptor.cpp
@@ -26,14 +26,14 @@
#include <boost/bind.hpp>
#include <boost/scoped_ptr.hpp>
-#include <sys/ConnectionOutputHandler.h>
-#include <sys/ConnectionInputHandler.h>
-#include <sys/ConnectionInputHandlerFactory.h>
-#include <sys/Acceptor.h>
-#include <sys/Socket.h>
-#include <framing/Buffer.h>
-#include <framing/AMQFrame.h>
-#include <Exception.h>
+#include "../ConnectionOutputHandler.h"
+#include "../ConnectionInputHandler.h"
+#include "../ConnectionInputHandlerFactory.h"
+#include "../Acceptor.h"
+#include "../Socket.h"
+#include "../../framing/Buffer.h"
+#include "../../framing/AMQFrame.h"
+#include "../../Exception.h"
#include "EventChannelConnection.h"
diff --git a/cpp/lib/common/sys/posix/EventChannelConnection.cpp b/cpp/src/sys/posix/EventChannelConnection.cpp
index 4449dc3035..cb6506bdde 100644
--- a/cpp/lib/common/sys/posix/EventChannelConnection.cpp
+++ b/cpp/src/sys/posix/EventChannelConnection.cpp
@@ -22,8 +22,8 @@
#include <boost/assert.hpp>
#include "EventChannelConnection.h"
-#include "sys/ConnectionInputHandlerFactory.h"
-#include "QpidError.h"
+#include "../ConnectionInputHandlerFactory.h"
+#include "../../QpidError.h"
using namespace std;
using namespace qpid;
diff --git a/cpp/lib/common/sys/posix/EventChannelConnection.h b/cpp/src/sys/posix/EventChannelConnection.h
index da7b6dca27..0c1eeff087 100644
--- a/cpp/lib/common/sys/posix/EventChannelConnection.h
+++ b/cpp/src/sys/posix/EventChannelConnection.h
@@ -22,11 +22,11 @@
#include <boost/ptr_container/ptr_deque.hpp>
#include "EventChannelThreads.h"
-#include "sys/Monitor.h"
-#include "sys/ConnectionOutputHandler.h"
-#include "sys/ConnectionInputHandler.h"
-#include "sys/AtomicCount.h"
-#include "framing/AMQFrame.h"
+#include "../Monitor.h"
+#include "../ConnectionOutputHandler.h"
+#include "../ConnectionInputHandler.h"
+#include "../AtomicCount.h"
+#include "../../framing/AMQFrame.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/posix/EventChannelThreads.cpp b/cpp/src/sys/posix/EventChannelThreads.cpp
index 95e699e0b0..90caf901b1 100644
--- a/cpp/lib/common/sys/posix/EventChannelThreads.cpp
+++ b/cpp/src/sys/posix/EventChannelThreads.cpp
@@ -17,7 +17,7 @@
*/
#include "EventChannelThreads.h"
-#include <sys/Runnable.h>
+#include "../Runnable.h"
#include <iostream>
using namespace std;
#include <boost/bind.hpp>
diff --git a/cpp/lib/common/sys/posix/EventChannelThreads.h b/cpp/src/sys/posix/EventChannelThreads.h
index 98403c0869..eb8b7cf287 100644
--- a/cpp/lib/common/sys/posix/EventChannelThreads.h
+++ b/cpp/src/sys/posix/EventChannelThreads.h
@@ -20,11 +20,11 @@
*/
#include <vector>
-#include <Exception.h>
-#include <sys/Time.h>
-#include <sys/Monitor.h>
-#include <sys/Thread.h>
-#include <sys/AtomicCount.h>
+#include "../../Exception.h"
+#include "../Time.h"
+#include "../Monitor.h"
+#include "../Thread.h"
+#include "../AtomicCount.h"
#include "EventChannel.h"
namespace qpid {
diff --git a/cpp/lib/common/sys/posix/PosixAcceptor.cpp b/cpp/src/sys/posix/PosixAcceptor.cpp
index a80a6c61f7..6ac0c2b11b 100644
--- a/cpp/lib/common/sys/posix/PosixAcceptor.cpp
+++ b/cpp/src/sys/posix/PosixAcceptor.cpp
@@ -19,8 +19,8 @@
*
*/
-#include <sys/Acceptor.h>
-#include <Exception.h>
+#include "../Acceptor.h"
+#include "../../Exception.h"
namespace qpid {
namespace sys {
diff --git a/cpp/lib/common/sys/posix/Socket.cpp b/cpp/src/sys/posix/Socket.cpp
index 5bd13742f6..6d6ac7f49c 100644
--- a/cpp/lib/common/sys/posix/Socket.cpp
+++ b/cpp/src/sys/posix/Socket.cpp
@@ -26,9 +26,9 @@
#include <boost/format.hpp>
-#include <QpidError.h>
-#include <posix/check.h>
-#include <sys/Socket.h>
+#include "../../QpidError.h"
+#include "check.h"
+#include "../Socket.h"
using namespace qpid::sys;
diff --git a/cpp/lib/common/sys/posix/Thread.cpp b/cpp/src/sys/posix/Thread.cpp
index f524799556..5b8d9e2180 100644
--- a/cpp/lib/common/sys/posix/Thread.cpp
+++ b/cpp/src/sys/posix/Thread.cpp
@@ -19,7 +19,7 @@
*
*/
-#include <sys/Thread.h>
+#include "../Thread.h"
void* qpid::sys::Thread::runRunnable(void* p)
{
diff --git a/cpp/lib/common/sys/posix/check.cpp b/cpp/src/sys/posix/check.cpp
index 408679caa8..408679caa8 100644
--- a/cpp/lib/common/sys/posix/check.cpp
+++ b/cpp/src/sys/posix/check.cpp
diff --git a/cpp/lib/common/sys/posix/check.h b/cpp/src/sys/posix/check.h
index 57b5a5757c..099044afa3 100644
--- a/cpp/lib/common/sys/posix/check.h
+++ b/cpp/src/sys/posix/check.h
@@ -24,7 +24,7 @@
#include <cerrno>
#include <string>
-#include <QpidError.h>
+#include "../../QpidError.h"
namespace qpid {
namespace sys {
diff --git a/cpp/tests/.vg-supp b/cpp/src/tests/.vg-supp
index b5abdf1385..b5abdf1385 100644
--- a/cpp/tests/.vg-supp
+++ b/cpp/src/tests/.vg-supp
diff --git a/cpp/tests/APRBaseTest.cpp b/cpp/src/tests/APRBaseTest.cpp
index 7d95c3bf52..5ed8bf1918 100644
--- a/cpp/tests/APRBaseTest.cpp
+++ b/cpp/src/tests/APRBaseTest.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <apr/APRBase.h>
-#include <qpid_test_plugin.h>
+#include "../sys/apr/APRBase.h"
+#include "qpid_test_plugin.h"
#include <iostream>
using namespace qpid::sys;
diff --git a/cpp/tests/AccumulatedAckTest.cpp b/cpp/src/tests/AccumulatedAckTest.cpp
index 30554f808e..56870209fe 100644
--- a/cpp/tests/AccumulatedAckTest.cpp
+++ b/cpp/src/tests/AccumulatedAckTest.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <AccumulatedAck.h>
-#include <qpid_test_plugin.h>
+#include "../broker/AccumulatedAck.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <list>
diff --git a/cpp/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp
index 66a7138dab..006391bbd2 100644
--- a/cpp/tests/BrokerChannelTest.cpp
+++ b/cpp/src/tests/BrokerChannelTest.cpp
@@ -18,19 +18,19 @@
* under the License.
*
*/
-#include <BrokerChannel.h>
-#include <BrokerMessage.h>
-#include <BrokerQueue.h>
-#include <FanOutExchange.h>
-#include <NullMessageStore.h>
-#include <qpid_test_plugin.h>
+#include "../broker/BrokerChannel.h"
+#include "../broker/BrokerMessage.h"
+#include "../broker/BrokerQueue.h"
+#include "../broker/FanOutExchange.h"
+#include "../broker/NullMessageStore.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <memory>
-#include <AMQP_HighestVersion.h>
-#include "AMQFrame.h"
+#include "AMQP_HighestVersion.h"
+#include "../framing/AMQFrame.h"
#include "MockChannel.h"
-#include "broker/Connection.h"
-#include "ProtocolInitiation.h"
+#include "../broker/Connection.h"
+#include "../framing/ProtocolInitiation.h"
#include <boost/ptr_container/ptr_vector.hpp>
using namespace boost;
diff --git a/cpp/tests/ClientChannelTest.cpp b/cpp/src/tests/ClientChannelTest.cpp
index d041106a23..458931c4f4 100644
--- a/cpp/tests/ClientChannelTest.cpp
+++ b/cpp/src/tests/ClientChannelTest.cpp
@@ -21,11 +21,11 @@
#include <vector>
#include "qpid_test_plugin.h"
#include "InProcessBroker.h"
-#include "ClientChannel.h"
-#include "ClientMessage.h"
-#include "ClientQueue.h"
-#include "ClientExchange.h"
-#include "client/MessageListener.h"
+#include "../client/ClientChannel.h"
+#include "../client/ClientMessage.h"
+#include "../client/ClientQueue.h"
+#include "../client/ClientExchange.h"
+#include "../client/MessageListener.h"
using namespace std;
using namespace boost;
diff --git a/cpp/tests/ConfigurationTest.cpp b/cpp/src/tests/ConfigurationTest.cpp
index 3a1d5ba85d..ecaa2865ce 100644
--- a/cpp/tests/ConfigurationTest.cpp
+++ b/cpp/src/tests/ConfigurationTest.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <Configuration.h>
-#include <qpid_test_plugin.h>
+#include "../broker/Configuration.h"
+#include "qpid_test_plugin.h"
#include <iostream>
using namespace std;
diff --git a/cpp/tests/EventChannelConnectionTest.cpp b/cpp/src/tests/EventChannelConnectionTest.cpp
index 66561daf83..24cd492441 100644
--- a/cpp/tests/EventChannelConnectionTest.cpp
+++ b/cpp/src/tests/EventChannelConnectionTest.cpp
@@ -21,12 +21,12 @@
#include <iostream>
#include <boost/bind.hpp>
-#include "framing/AMQHeartbeatBody.h"
-#include "framing/AMQFrame.h"
-#include "sys/posix/EventChannelConnection.h"
-#include "sys/ConnectionInputHandler.h"
-#include "sys/ConnectionInputHandlerFactory.h"
-#include "sys/Socket.h"
+#include "../framing/AMQHeartbeatBody.h"
+#include "../framing/AMQFrame.h"
+#include "../sys/posix/EventChannelConnection.h"
+#include "../sys/ConnectionInputHandler.h"
+#include "../sys/ConnectionInputHandlerFactory.h"
+#include "../sys/Socket.h"
#include "qpid_test_plugin.h"
#include "MockConnectionInputHandler.h"
diff --git a/cpp/tests/EventChannelTest.cpp b/cpp/src/tests/EventChannelTest.cpp
index 8e5c724a15..45229ce20f 100644
--- a/cpp/tests/EventChannelTest.cpp
+++ b/cpp/src/tests/EventChannelTest.cpp
@@ -18,12 +18,12 @@
* under the License.
*
*/
-#include <posix/EventChannel.h>
-#include <posix/check.h>
-#include <sys/Runnable.h>
-#include <sys/Socket.h>
-#include <sys/Thread.h>
-#include <qpid_test_plugin.h>
+#include "../sys/posix/EventChannel.h"
+#include "../sys/posix/check.h"
+#include "../sys/Runnable.h"
+#include "../sys/Socket.h"
+#include "../sys/Thread.h"
+#include "qpid_test_plugin.h"
#include <sys/socket.h>
#include <signal.h>
diff --git a/cpp/tests/EventChannelThreadsTest.cpp b/cpp/src/tests/EventChannelThreadsTest.cpp
index 285ed29518..ee1e2859c4 100644
--- a/cpp/tests/EventChannelThreadsTest.cpp
+++ b/cpp/src/tests/EventChannelThreadsTest.cpp
@@ -21,9 +21,9 @@
#include <iostream>
#include <boost/bind.hpp>
-#include <sys/Socket.h>
-#include <posix/EventChannelThreads.h>
-#include <qpid_test_plugin.h>
+#include "../sys/Socket.h"
+#include "../sys/posix/EventChannelThreads.h"
+#include "qpid_test_plugin.h"
using namespace std;
diff --git a/cpp/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp
index cccec92024..97846cf527 100644
--- a/cpp/tests/ExchangeTest.cpp
+++ b/cpp/src/tests/ExchangeTest.cpp
@@ -19,12 +19,12 @@
*
*/
-#include <DeliverableMessage.h>
-#include <DirectExchange.h>
-#include <BrokerExchange.h>
-#include <BrokerQueue.h>
-#include <TopicExchange.h>
-#include <qpid_test_plugin.h>
+#include "../broker/DeliverableMessage.h"
+#include "../broker/DirectExchange.h"
+#include "../broker/BrokerExchange.h"
+#include "../broker/BrokerQueue.h"
+#include "../broker/TopicExchange.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include "BasicGetBody.h"
diff --git a/cpp/tests/FieldTableTest.cpp b/cpp/src/tests/FieldTableTest.cpp
index 8d9285bf4b..f485ca187e 100644
--- a/cpp/tests/FieldTableTest.cpp
+++ b/cpp/src/tests/FieldTableTest.cpp
@@ -19,8 +19,8 @@
*
*/
#include <iostream>
-#include <amqp_framing.h>
-#include <qpid_test_plugin.h>
+#include "../framing/amqp_framing.h"
+#include "qpid_test_plugin.h"
using namespace qpid::framing;
diff --git a/cpp/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp
index f8754337c8..89a559d0bb 100644
--- a/cpp/tests/FramingTest.cpp
+++ b/cpp/src/tests/FramingTest.cpp
@@ -21,23 +21,23 @@
#include <memory>
#include <boost/lexical_cast.hpp>
-#include <ConnectionRedirectBody.h>
-#include <ProtocolVersion.h>
-#include <amqp_framing.h>
+#include "ConnectionRedirectBody.h"
+#include "../framing/ProtocolVersion.h"
+#include "../framing/amqp_framing.h"
#include <iostream>
-#include <qpid_test_plugin.h>
+#include "qpid_test_plugin.h"
#include <sstream>
#include <typeinfo>
-#include <QpidError.h>
-#include <AMQP_HighestVersion.h>
-#include "AMQRequestBody.h"
-#include "AMQResponseBody.h"
-#include "Requester.h"
-#include "Responder.h"
+#include "../QpidError.h"
+#include "AMQP_HighestVersion.h"
+#include "../framing/AMQRequestBody.h"
+#include "../framing/AMQResponseBody.h"
+#include "../framing/Requester.h"
+#include "../framing/Responder.h"
#include "InProcessBroker.h"
-#include "client/Connection.h"
-#include "client/ClientExchange.h"
-#include "client/ClientQueue.h"
+#include "../client/Connection.h"
+#include "../client/ClientExchange.h"
+#include "../client/ClientQueue.h"
using namespace qpid;
using namespace qpid::framing;
diff --git a/cpp/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp
index 77e68829c3..29e2ddee3d 100644
--- a/cpp/tests/HeaderTest.cpp
+++ b/cpp/src/tests/HeaderTest.cpp
@@ -19,8 +19,8 @@
*
*/
#include <iostream>
-#include <amqp_framing.h>
-#include <qpid_test_plugin.h>
+#include "../framing/amqp_framing.h"
+#include "qpid_test_plugin.h"
using namespace qpid::framing;
diff --git a/cpp/tests/HeadersExchangeTest.cpp b/cpp/src/tests/HeadersExchangeTest.cpp
index 6cd51c55a9..64125f4a0a 100644
--- a/cpp/tests/HeadersExchangeTest.cpp
+++ b/cpp/src/tests/HeadersExchangeTest.cpp
@@ -19,10 +19,10 @@
*
*/
-#include <HeadersExchange.h>
-#include <FieldTable.h>
-#include <Value.h>
-#include <qpid_test_plugin.h>
+#include "../broker/HeadersExchange.h"
+#include "../framing/FieldTable.h"
+#include "../framing/Value.h"
+#include "qpid_test_plugin.h"
using namespace qpid::broker;
using namespace qpid::framing;
diff --git a/cpp/tests/InMemoryContentTest.cpp b/cpp/src/tests/InMemoryContentTest.cpp
index 4597ee5e5d..6c7dd58258 100644
--- a/cpp/tests/InMemoryContentTest.cpp
+++ b/cpp/src/tests/InMemoryContentTest.cpp
@@ -18,12 +18,12 @@
* under the License.
*
*/
-#include <InMemoryContent.h>
-#include <qpid_test_plugin.h>
-#include <AMQP_HighestVersion.h>
+#include "../broker/InMemoryContent.h"
+#include "qpid_test_plugin.h"
+#include "AMQP_HighestVersion.h"
#include <iostream>
#include <list>
-#include "AMQFrame.h"
+#include "../framing/AMQFrame.h"
#include "MockChannel.h"
using std::list;
diff --git a/cpp/tests/InProcessBroker.h b/cpp/src/tests/InProcessBroker.h
index 2882ab28e8..ff94ddbe9f 100644
--- a/cpp/tests/InProcessBroker.h
+++ b/cpp/src/tests/InProcessBroker.h
@@ -19,11 +19,11 @@
*
*/
#include "AMQP_HighestVersion.h"
-#include "framing/AMQFrame.h"
-#include "broker/Broker.h"
-#include "broker/Connection.h"
-#include "client/Connector.h"
-#include "client/Connection.h"
+#include "../framing/AMQFrame.h"
+#include "../broker/Broker.h"
+#include "../broker/Connection.h"
+#include "../client/Connector.h"
+#include "../client/Connection.h"
#include <vector>
#include <iostream>
diff --git a/cpp/tests/LazyLoadedContentTest.cpp b/cpp/src/tests/LazyLoadedContentTest.cpp
index 4cd8e9b307..9d0da2206d 100644
--- a/cpp/tests/LazyLoadedContentTest.cpp
+++ b/cpp/src/tests/LazyLoadedContentTest.cpp
@@ -18,14 +18,14 @@
* under the License.
*
*/
-#include <LazyLoadedContent.h>
-#include <AMQP_HighestVersion.h>
-#include <NullMessageStore.h>
-#include <qpid_test_plugin.h>
+#include "../broker/LazyLoadedContent.h"
+#include "AMQP_HighestVersion.h"
+#include "../broker/NullMessageStore.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <list>
#include <sstream>
-#include "AMQFrame.h"
+#include "../framing/AMQFrame.h"
#include "MockChannel.h"
using std::list;
using std::string;
diff --git a/cpp/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 6ae3598a98..1b4b65fb4f 100644
--- a/cpp/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -1,12 +1,6 @@
AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS)
INCLUDES = \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/client \
- -I$(top_srcdir)/lib/broker \
- -I$(top_srcdir)/lib/common \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing \
+ -I$(srcdir)/../gen \
$(APR_CXXFLAGS)
# Unit tests
@@ -95,9 +89,9 @@ libdlclose_noop_la_SOURCES = dlclose_noop.c
abs_builddir = @abs_builddir@
extra_libs = $(CPPUNIT_LIBS)
-lib_client = $(abs_builddir)/../lib/client/libqpidclient.la
-lib_common = $(abs_builddir)/../lib/common/libqpidcommon.la
-lib_broker = $(abs_builddir)/../lib/broker/libqpidbroker.la
+lib_client = $(abs_builddir)/../client/libqpidclient.la
+lib_common = $(abs_builddir)/../libqpidcommon.la
+lib_broker = $(abs_builddir)/../broker/libqpidbroker.la
gen.mk: Makefile.am
( \
diff --git a/cpp/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp
index 68e5abf60e..b660987708 100644
--- a/cpp/tests/MessageBuilderTest.cpp
+++ b/cpp/src/tests/MessageBuilderTest.cpp
@@ -18,12 +18,12 @@
* under the License.
*
*/
-#include <Exception.h>
-#include <BrokerMessage.h>
-#include <MessageBuilder.h>
-#include <NullMessageStore.h>
-#include <Buffer.h>
-#include <qpid_test_plugin.h>
+#include "../Exception.h"
+#include "../broker/BrokerMessage.h"
+#include "../broker/MessageBuilder.h"
+#include "../broker/NullMessageStore.h"
+#include "../framing/Buffer.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <memory>
#include "MockChannel.h"
diff --git a/cpp/tests/MessageHandlerTest.cpp b/cpp/src/tests/MessageHandlerTest.cpp
index 55971355f6..277c0fc4b9 100644
--- a/cpp/tests/MessageHandlerTest.cpp
+++ b/cpp/src/tests/MessageHandlerTest.cpp
@@ -20,10 +20,10 @@
*/
//#include <iostream>
//#include <AMQP_HighestVersion.h>
-#include <amqp_framing.h>
-#include <qpid_test_plugin.h>
+#include "../framing/amqp_framing.h"
+#include "qpid_test_plugin.h"
-#include <BrokerAdapter.h>
+#include "../broker/BrokerAdapter.h"
using namespace qpid::framing;
using namespace qpid::broker;
diff --git a/cpp/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp
index 6d766c2260..136c6f2d8d 100644
--- a/cpp/tests/MessageTest.cpp
+++ b/cpp/src/tests/MessageTest.cpp
@@ -18,11 +18,11 @@
* under the License.
*
*/
-#include <BrokerMessage.h>
-#include <qpid_test_plugin.h>
+#include "../broker/BrokerMessage.h"
+#include "qpid_test_plugin.h"
#include <iostream>
-#include <AMQP_HighestVersion.h>
-#include "AMQFrame.h"
+#include "AMQP_HighestVersion.h"
+#include "../framing/AMQFrame.h"
#include "MockChannel.h"
using namespace boost;
diff --git a/cpp/tests/MockChannel.h b/cpp/src/tests/MockChannel.h
index 79aa1d35af..e47d591a9e 100644
--- a/cpp/tests/MockChannel.h
+++ b/cpp/src/tests/MockChannel.h
@@ -19,10 +19,10 @@
*
*/
-#include "framing/MethodContext.h"
-#include "framing/ChannelAdapter.h"
-#include "framing/OutputHandler.h"
-#include "framing/AMQFrame.h"
+#include "../framing/MethodContext.h"
+#include "../framing/ChannelAdapter.h"
+#include "../framing/OutputHandler.h"
+#include "../framing/AMQFrame.h"
#include "BasicGetBody.h"
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
diff --git a/cpp/tests/MockConnectionInputHandler.h b/cpp/src/tests/MockConnectionInputHandler.h
index 55dbceaf44..4503ac33a5 100644
--- a/cpp/tests/MockConnectionInputHandler.h
+++ b/cpp/src/tests/MockConnectionInputHandler.h
@@ -19,10 +19,10 @@
*
*/
-#include "sys/ConnectionInputHandler.h"
-#include "sys/ConnectionInputHandlerFactory.h"
-#include "sys/Monitor.h"
-#include "framing/ProtocolInitiation.h"
+#include "../sys/ConnectionInputHandler.h"
+#include "../sys/ConnectionInputHandlerFactory.h"
+#include "../sys/Monitor.h"
+#include "../framing/ProtocolInitiation.h"
struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
diff --git a/cpp/tests/ProducerConsumerTest.cpp b/cpp/src/tests/ProducerConsumerTest.cpp
index ee94a56c55..f2f3ab689a 100644
--- a/cpp/tests/ProducerConsumerTest.cpp
+++ b/cpp/src/tests/ProducerConsumerTest.cpp
@@ -23,12 +23,12 @@
#include <boost/bind.hpp>
-#include <qpid_test_plugin.h>
+#include "qpid_test_plugin.h"
#include "InProcessBroker.h"
-#include "sys/ProducerConsumer.h"
-#include "sys/Thread.h"
+#include "../sys/ProducerConsumer.h"
+#include "../sys/Thread.h"
#include "AMQP_HighestVersion.h"
-#include "sys/AtomicCount.h"
+#include "../sys/AtomicCount.h"
using namespace qpid;
using namespace sys;
diff --git a/cpp/tests/QueuePolicyTest.cpp b/cpp/src/tests/QueuePolicyTest.cpp
index 20917dcd6a..5ccc9417cd 100644
--- a/cpp/tests/QueuePolicyTest.cpp
+++ b/cpp/src/tests/QueuePolicyTest.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <QueuePolicy.h>
-#include <qpid_test_plugin.h>
+#include "../broker/QueuePolicy.h"
+#include "qpid_test_plugin.h"
using namespace qpid::broker;
using namespace qpid::framing;
diff --git a/cpp/tests/QueueRegistryTest.cpp b/cpp/src/tests/QueueRegistryTest.cpp
index 3926d56292..d01fbd0ad4 100644
--- a/cpp/tests/QueueRegistryTest.cpp
+++ b/cpp/src/tests/QueueRegistryTest.cpp
@@ -17,8 +17,8 @@
* under the License.
*/
-#include <QueueRegistry.h>
-#include <qpid_test_plugin.h>
+#include "../broker/QueueRegistry.h"
+#include "qpid_test_plugin.h"
#include <string>
using namespace qpid::broker;
diff --git a/cpp/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index e90c9259cf..bb2b424375 100644
--- a/cpp/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include <BrokerQueue.h>
-#include <QueueRegistry.h>
-#include <qpid_test_plugin.h>
+#include "../broker/BrokerQueue.h"
+#include "../broker/QueueRegistry.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include "MockChannel.h"
diff --git a/cpp/tests/ReferenceTest.cpp b/cpp/src/tests/ReferenceTest.cpp
index 753f68ee75..b179ab8fdd 100644
--- a/cpp/tests/ReferenceTest.cpp
+++ b/cpp/src/tests/ReferenceTest.cpp
@@ -21,11 +21,11 @@
#include <iostream>
#include <memory>
#include "qpid_test_plugin.h"
-#include "Reference.h"
-#include "BrokerMessageMessage.h"
+#include "../broker/Reference.h"
+#include "../broker/BrokerMessageMessage.h"
#include "MessageTransferBody.h"
#include "MessageAppendBody.h"
-#include "CompletionHandler.h"
+#include "../broker/CompletionHandler.h"
using namespace boost;
using namespace qpid::broker;
diff --git a/cpp/tests/TopicExchangeTest.cpp b/cpp/src/tests/TopicExchangeTest.cpp
index 4ba9cdd6e5..39035c776f 100644
--- a/cpp/tests/TopicExchangeTest.cpp
+++ b/cpp/src/tests/TopicExchangeTest.cpp
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include <TopicExchange.h>
-#include <qpid_test_plugin.h>
+#include "../broker/TopicExchange.h"
+#include "qpid_test_plugin.h"
using namespace qpid::broker;
diff --git a/cpp/tests/TxAckTest.cpp b/cpp/src/tests/TxAckTest.cpp
index eb4ada4ac8..91e07a3faa 100644
--- a/cpp/tests/TxAckTest.cpp
+++ b/cpp/src/tests/TxAckTest.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <NullMessageStore.h>
-#include <RecoveryManager.h>
-#include <TxAck.h>
-#include <qpid_test_plugin.h>
+#include "../broker/NullMessageStore.h"
+#include "../broker/RecoveryManager.h"
+#include "../broker/TxAck.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <list>
#include <vector>
diff --git a/cpp/tests/TxBufferTest.cpp b/cpp/src/tests/TxBufferTest.cpp
index bd8ae3796b..0d1fe7a04b 100644
--- a/cpp/tests/TxBufferTest.cpp
+++ b/cpp/src/tests/TxBufferTest.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include <TxBuffer.h>
-#include <qpid_test_plugin.h>
+#include "../broker/TxBuffer.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <vector>
diff --git a/cpp/tests/TxPublishTest.cpp b/cpp/src/tests/TxPublishTest.cpp
index 8ce0da6508..84d2666b6c 100644
--- a/cpp/tests/TxPublishTest.cpp
+++ b/cpp/src/tests/TxPublishTest.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include <NullMessageStore.h>
-#include <RecoveryManager.h>
-#include <TxPublish.h>
-#include <qpid_test_plugin.h>
+#include "../broker/NullMessageStore.h"
+#include "../broker/RecoveryManager.h"
+#include "../broker/TxPublish.h"
+#include "qpid_test_plugin.h"
#include <iostream>
#include <list>
#include <vector>
diff --git a/cpp/tests/ValueTest.cpp b/cpp/src/tests/ValueTest.cpp
index a3f9ec2541..2d1fc45461 100644
--- a/cpp/tests/ValueTest.cpp
+++ b/cpp/src/tests/ValueTest.cpp
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include <Value.h>
-#include <qpid_test_plugin.h>
+#include "../framing/Value.h"
+#include "qpid_test_plugin.h"
using namespace qpid::framing;
diff --git a/cpp/tests/client_test.cpp b/cpp/src/tests/client_test.cpp
index 92952c69b1..5c084302d8 100644
--- a/cpp/tests/client_test.cpp
+++ b/cpp/src/tests/client_test.cpp
@@ -28,13 +28,13 @@
#include <iostream>
-#include <QpidError.h>
-#include <ClientChannel.h>
-#include <Connection.h>
-#include <ClientMessage.h>
-#include <MessageListener.h>
-#include <sys/Monitor.h>
-#include <FieldTable.h>
+#include "../QpidError.h"
+#include "../client/ClientChannel.h"
+#include "../client/Connection.h"
+#include "../client/ClientMessage.h"
+#include "../client/MessageListener.h"
+#include "../sys/Monitor.h"
+#include "../framing/FieldTable.h"
using namespace qpid::client;
using namespace qpid::sys;
diff --git a/cpp/tests/dlclose_noop.c b/cpp/src/tests/dlclose_noop.c
index ba2fa75891..ba2fa75891 100644
--- a/cpp/tests/dlclose_noop.c
+++ b/cpp/src/tests/dlclose_noop.c
diff --git a/cpp/tests/echo_service.cpp b/cpp/src/tests/echo_service.cpp
index ff11a336fe..14224eeee5 100644
--- a/cpp/tests/echo_service.cpp
+++ b/cpp/src/tests/echo_service.cpp
@@ -27,13 +27,13 @@
* sender-specified private queue.
*/
-#include <QpidError.h>
-#include <ClientChannel.h>
-#include <Connection.h>
-#include <ClientExchange.h>
-#include <MessageListener.h>
-#include <ClientQueue.h>
-#include <sys/Time.h>
+#include "../QpidError.h"
+#include "../client/ClientChannel.h"
+#include "../client/Connection.h"
+#include "../client/ClientExchange.h"
+#include "../client/MessageListener.h"
+#include "../client/ClientQueue.h"
+#include "../sys/Time.h"
#include <iostream>
#include <sstream>
diff --git a/cpp/tests/examples.Makefile b/cpp/src/tests/examples.Makefile
index 45999f7852..45999f7852 100644
--- a/cpp/tests/examples.Makefile
+++ b/cpp/src/tests/examples.Makefile
diff --git a/cpp/tests/examples.README b/cpp/src/tests/examples.README
index 65f908c249..65f908c249 100644
--- a/cpp/tests/examples.README
+++ b/cpp/src/tests/examples.README
diff --git a/cpp/tests/kill_broker b/cpp/src/tests/kill_broker
index b71ca22ffd..b71ca22ffd 100755
--- a/cpp/tests/kill_broker
+++ b/cpp/src/tests/kill_broker
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
new file mode 100755
index 0000000000..585c1da913
--- /dev/null
+++ b/cpp/src/tests/python_tests
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Run the python tests.
+if test -d ../../../python ; then
+ cd ../../../python && ./run-tests -v -s "0-9" -I cpp_failing_0-9.txt
+else
+ echo Warning: python tests not found.
+fi
+
diff --git a/cpp/tests/qpid_test_plugin.h b/cpp/src/tests/qpid_test_plugin.h
index b2f4a8ffed..b2f4a8ffed 100644
--- a/cpp/tests/qpid_test_plugin.h
+++ b/cpp/src/tests/qpid_test_plugin.h
diff --git a/cpp/tests/quick_topictest b/cpp/src/tests/quick_topictest
index 9df5b5c84c..9df5b5c84c 100755
--- a/cpp/tests/quick_topictest
+++ b/cpp/src/tests/quick_topictest
diff --git a/cpp/tests/run-python-tests b/cpp/src/tests/run-python-tests
index e69de29bb2..e69de29bb2 100755
--- a/cpp/tests/run-python-tests
+++ b/cpp/src/tests/run-python-tests
diff --git a/cpp/tests/run-unit-tests b/cpp/src/tests/run-unit-tests
index f066a38205..f066a38205 100755
--- a/cpp/tests/run-unit-tests
+++ b/cpp/src/tests/run-unit-tests
diff --git a/cpp/tests/setup b/cpp/src/tests/setup
index aaa3afd9b8..aaa3afd9b8 100644
--- a/cpp/tests/setup
+++ b/cpp/src/tests/setup
diff --git a/cpp/tests/start_broker b/cpp/src/tests/start_broker
index fe30458463..64d26883be 100755
--- a/cpp/tests/start_broker
+++ b/cpp/src/tests/start_broker
@@ -7,7 +7,7 @@ PID=`pwd`/qpidd.pid
rm -rf $LOG $PID
# Start the daemon, recording its PID.
-../src/qpidd > $LOG 2>&1 & echo $! > $PID
+../qpidd > $LOG 2>&1 & echo $! > $PID
# FIXME aconway 2007-01-18: qpidd should not return till it is accepting
# connections, remove arbitrary sleep.
diff --git a/cpp/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp
index 5928dac49a..0b7d6c4e86 100644
--- a/cpp/tests/topic_listener.cpp
+++ b/cpp/src/tests/topic_listener.cpp
@@ -32,13 +32,13 @@
* listening).
*/
-#include <QpidError.h>
-#include <ClientChannel.h>
-#include <Connection.h>
-#include <ClientExchange.h>
-#include <MessageListener.h>
-#include <ClientQueue.h>
-#include <sys/Time.h>
+#include "../QpidError.h"
+#include "../client/ClientChannel.h"
+#include "../client/Connection.h"
+#include "../client/ClientExchange.h"
+#include "../client/MessageListener.h"
+#include "../client/ClientQueue.h"
+#include "../sys/Time.h"
#include <iostream>
#include <sstream>
diff --git a/cpp/tests/topic_publisher.cpp b/cpp/src/tests/topic_publisher.cpp
index 2fd1e6b810..e4b39a2966 100644
--- a/cpp/tests/topic_publisher.cpp
+++ b/cpp/src/tests/topic_publisher.cpp
@@ -34,15 +34,15 @@
* subscriber shutdown.
*/
-#include <QpidError.h>
-#include <ClientChannel.h>
-#include <Connection.h>
-#include <ClientExchange.h>
-#include <MessageListener.h>
-#include <ClientQueue.h>
-#include <sys/Monitor.h>
-#include "unistd.h"
-#include <sys/Time.h>
+#include "../QpidError.h"
+#include "../client/ClientChannel.h"
+#include "../client/Connection.h"
+#include "../client/ClientExchange.h"
+#include "../client/MessageListener.h"
+#include "../client/ClientQueue.h"
+#include "../sys/Monitor.h"
+#include <unistd.h>
+#include "../sys/Time.h"
#include <cstdlib>
#include <iostream>
diff --git a/cpp/tests/topictest b/cpp/src/tests/topictest
index 92e40b2c37..92e40b2c37 100755
--- a/cpp/tests/topictest
+++ b/cpp/src/tests/topictest
diff --git a/cpp/tests/python_tests b/cpp/tests/python_tests
deleted file mode 100755
index 4ee177ce6a..0000000000
--- a/cpp/tests/python_tests
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Run the python tests.
-if test -d ../../python ; then
- cd ../../python && ./run-tests -v -s "0-9" -I cpp_failing_0-9.txt
-else
- echo Warning: python tests not found.
-fi
-