You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2006/10/16 15:50:36 UTC
svn commit: r464494 [1/3] - in /incubator/qpid/trunk/qpid/cpp: ./ broker/
client/ common/ etc/ etc/stylesheets/ qpidd/ src/ src/qpid/
src/qpid/broker/ src/qpid/client/ src/qpid/concurrent/ src/qpid/framing/
src/qpid/io/ test/client/ test/unit/ test/uni...
Author: aconway
Date: Mon Oct 16 06:50:26 2006
New Revision: 464494
URL: http://svn.apache.org/viewvc?view=rev&rev=464494
Log:
Build system reorg, see README and Makefile comments for details.
Added:
incubator/qpid/trunk/qpid/cpp/etc/
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/
- copied from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_operations.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_consts.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_consts.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/code_gen.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/code_gen.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/code_utils.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/code_utils.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/convert_0.81.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/convert_0.81.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/cpp.xsl
- copied, changed from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/cpp.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/framing.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/framing.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/prepare1.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/prepare1.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/prepare2.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/prepare2.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/prepare3.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/prepare3.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/registry.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/registry.xsl
incubator/qpid/trunk/qpid/cpp/etc/stylesheets/utils.xsl
- copied unchanged from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/utils.xsl
incubator/qpid/trunk/qpid/cpp/src/
incubator/qpid/trunk/qpid/cpp/src/memory.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/utils/inc/memory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/
incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/error/src/Exception.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.h
- copied unchanged from r463376, incubator/qpid/trunk/qpid/cpp/common/error/inc/Exception.h
incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/error/src/QpidError.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/error/inc/QpidError.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/AutoDelete.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/AutoDelete.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Binding.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/broker/src/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/broker/inc/Broker.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/broker/src/Configuration.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/broker/inc/Configuration.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionToken.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/ConnectionToken.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Consumer.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/DirectExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/DirectExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Exchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeBinding.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeBinding.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeRegistry.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/FanOutExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/FanOutExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/HeadersExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/HeadersExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Message.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/NameGenerator.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/NameGenerator.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Queue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/QueueRegistry.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/QueueRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Router.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Router.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerFactoryImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerFactoryImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/TopicExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/TopicExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Channel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Exchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Exchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/IncomingMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/IncomingMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Message.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/MessageListener.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/MessageListener.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/Queue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/ResponseHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/ResponseHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/src/ReturnedMessageHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/client/inc/ReturnedMessageHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRBase.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRBase.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRMonitor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRMonitor.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRMonitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThread.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThread.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThread.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadFactory.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/APRThreadPool.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/APRThreadPool.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/APRThreadPool.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LMonitor.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LMonitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LThreadFactory.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LThreadFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/LockedQueue.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/LockedQueue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Monitor.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/Monitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/MonitorImpl.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/MonitorImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Runnable.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/src/Runnable.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Runnable.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/Runnable.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/TaskQueue.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/TaskQueue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/Thread.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/Thread.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactory.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadFactoryImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/concurrent/ThreadPool.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/concurrent/inc/ThreadPool.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQContentBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQContentBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQDataBlock.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQDataBlock.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQFrame.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQFrame.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeaderBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeaderBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQHeartbeatBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQHeartbeatBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/AMQMethodBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/AMQMethodBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/BasicHeaderProperties.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/BasicHeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/BodyHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/BodyHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/Buffer.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/Buffer.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/FieldTable.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/FieldTable.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/HeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/InitiationHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/InitiationHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/InputHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/InputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/OutputHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/OutputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/ProtocolInitiation.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/ProtocolInitiation.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/src/Value.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/Value.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/amqp_framing.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_types.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/inc/amqp_types.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/
incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/APRConnector.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRConnector.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/APRConnector.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/APRSocket.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/APRSocket.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/Acceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/Acceptor.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/Acceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRAcceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/BlockingAPRSessionContext.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/BlockingAPRSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/Connector.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/Connector.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/ConnectorImpl.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/ConnectorImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LConnector.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/LConnector.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/LFAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFAcceptor.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/LFAcceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/src/LFProcessor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFProcessor.h
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/common/io/inc/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/src/LFSessionContext.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/io/LFSessionContext.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/LFSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionHandlerFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionManager.h
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionManager.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/ShutdownHandler.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/ShutdownHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/TimeoutHandler.h
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/TimeoutHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
- copied, changed from r463376, incubator/qpid/trunk/qpid/cpp/qpidd/src/qpidd.cpp
incubator/qpid/trunk/qpid/cpp/test/client/
incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/client/test/client_test.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/client/test/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/client/test/topic_publisher.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/ExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/HeadersExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/Makefile
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/Makefile
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/MessageTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/QueueRegistryTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/QueueTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/RouterTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/TopicExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/ValueTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/BodyHandlerTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/Makefile
- copied unchanged from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/Makefile
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/field_table_test.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/framing_test.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/framing_test.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/header_test.cpp
- copied, changed from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/header_test.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/io/
Removed:
incubator/qpid/trunk/qpid/cpp/broker/
incubator/qpid/trunk/qpid/cpp/client/
incubator/qpid/trunk/qpid/cpp/common/
incubator/qpid/trunk/qpid/cpp/qpidd/
incubator/qpid/trunk/qpid/cpp/test_plugins.mk
Modified:
incubator/qpid/trunk/qpid/cpp/DESIGN
incubator/qpid/trunk/qpid/cpp/Makefile
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/options.mk
Modified: incubator/qpid/trunk/qpid/cpp/DESIGN
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/DESIGN?view=diff&rev=464494&r1=464493&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/DESIGN (original)
+++ incubator/qpid/trunk/qpid/cpp/DESIGN Mon Oct 16 06:50:26 2006
@@ -1,37 +1,27 @@
Qpid C++ AMQP implementation
=============================
-The following is a brief description of the logical design of the
-Qpid C++ code.
+= Project layout =
-Layout
+For Build system design see comment at start of Makefile.
-There are three top level modules. The first two, client and broker,
-containi the code required for an AMQP client and an AMQP broker
-respectively. The third, common, contains code that is common to both
-client and broker implementations. [Note that at present only the
-client has been started].
-
-Within the common module there are currently four sub-modules. The
-largest of these is framing, containing the definitions of classes
-corresponding to key AMQP concepts such as frames, content & header
-bodies, particular method bodies etc as well as some interfaces and
-utilities used in the encoding and decoding of the wire protocol.
-
-Two of the other sub-modules in common, io and concurrent, provide
-abstractions of core io and concurrency constructs used in the client
-and broker code. The intention is to allow these to be implemented in
-different ways.interaction with the wire protocol. At present the
-implementation of the io and concurrency abstractions is based on APR
-(Apache Portable Runtime). [Note: the io module currently only
-contains the abstractions as seen from the client - the Connector. It
-will in due time likely have the analogous broker-side abstraction -
-the Acceptor].
+Project contains:
+ * Client library (lib/libqpid_client): src/qpid/client
+ * Broker library (lib/libqpid_broker): src/qpid/broker
+ * Common classes
+ * src/qpid/concurrent: concurrecy
+ * src/qpid/framing: wire encoding/decoding
+ * src/qpid/io: reading/writing
+ * src/qpid/Exception.cpp, QpidError.cpp: Exception classes.
+ * Qpid Daemon (bin/qpidd): src/qpidd.cpp
-The final common sub-module is error, containing a simple exception
-definition used in all the error handling.
+Unit tests in test/unit: each *Test.cpp builds a CppUnit plugin.
-Client Design
+Client tests in test/client: each *.cpp builds a test executable.
+
+Test utilities: test/include
+
+= Client Design =
The client module is primarily concerned with presenting the
functionality offered by AMQP to users through a simple API that
Modified: incubator/qpid/trunk/qpid/cpp/Makefile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile?view=diff&rev=464494&r1=464493&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Mon Oct 16 06:50:26 2006
@@ -13,37 +13,125 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# ----------------------------------------------------------------
#
-# Master make file for c++ Qpid project (AMQP)
+# Makefile for Qpid C++ project.
+#
+# Build system principles
+# * Single Makefile (see http://www.apache.org/licenses/LICENSE-2.0)
+# * Build from directories, no explicit source lists in Makefile.
+# * Corresponding .cpp and .h files in same directory for easy editing.
+# * Source directory structure mirrors C++ namespaces.
#
-# Calls the makefiles in the various subdirectories in order to
-# build them in the correct sequence.
+# Source directories:
+# * src/ - .h and .cpp source files, directories mirror namespaces.
+# * test/
+# * unit/ - unit tests (cppunit plugins), directories mirror namespaces.
+# * include/ - .h files used by tests
+# * client/ - sources for client test executables.
+# * etc/ - Non-c++ resources, e.g. stylesheets.
+# * gen/ - generated code
+#
+# Output directories:
+# * gen/ - (created by make) generated code
+# * bin/ lib/ - exes & libraries.
+#
+# NOTE: always use := rather than = unless you have a specific need
+# for delayed evaluation. See the link for details.
#
-UNITTESTS=$(wildcard common/*/test/*.so broker/test/*.so)
-SUBDIRS=common broker qpidd client
+include options.mk
-.PHONY: all test unittest pythontest runtests clean doxygen
+.PHONY: test all unittest pythontest
-test: all runtests
+test: all unittest pythontest
-unittest:
- DllPlugInTester -c -b $(UNITTESTS)
+## Generaged code
-pythontest:
- bin/qpidd >> qpidd.log &
+SPEC := $(CURDIR)/../specs/amqp-8.0.xml
+XSL := code_gen.xsl framing.xsl
+STYLESHEETS := $(XSL:%=$(CURDIR)/etc/stylesheets/%)
+TRANSFORM := java -jar $(CURDIR)/tools/saxon8.jar -o results.out $(SPEC)
+
+.PHONY: generate
+
+generate: gen/timestamp
+
+# Restart make if code is re-generated to get proper dependencies.
+# Remove "clean" to avoid infinite loop.
+REMAKE := exec $(MAKE) $(MAKECMDGOALS:clean=)
+gen/timestamp: $(wildcard etc/stylesheets/*.xsl) $(SPEC)
+ mkdir -p gen/qpid/framing
+ echo > gen/timestamp
+ cd gen/qpid/framing && for s in $(STYLESHEETS) ; do $(TRANSFORM) $$s ; done
+ @echo "*** Re-generated code, re-starting make ***"
+ $(REMAKE)
+
+gen $(wildcard gen/qpid/framing/*.cpp): gen/timestamp
+
+## Libraries
+
+# Library command, late evaluated for $@
+LIB_CMD = $(CXX) -shared -o $@ $(LDFLAGS) $(CXXFLAGS) -lapr-1
+
+# Common library.
+COMMON_LIB := lib/libqpid_common.so.1.0
+COMMON_DIRS := qpid/concurrent qpid/framing qpid/io qpid
+COMMON_SRC := $(wildcard gen/qpid/framing/*.cpp $(COMMON_DIRS:%=src/%/*.cpp))
+$(COMMON_LIB): generate $(COMMON_SRC:.cpp=.o)
+ $(LIB_CMD) $(COMMON_SRC:.cpp=.o)
+all: $(COMMON_LIB)
+UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp))
+
+# Client library.
+CLIENT_LIB := lib/libqpid_client.so.1.0
+CLIENT_SRC := $(wildcard src/qpid/client/*.cpp)
+$(CLIENT_LIB): $(CLIENT_SRC:.cpp=.o) $(COMMON_LIB)
+ $(LIB_CMD) $^
+all: $(CLIENT_LIB)
+UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp))
+
+# Broker library.
+BROKER_LIB := lib/libqpid_broker.so.1.0
+BROKER_SRC := $(wildcard src/qpid/broker/*.cpp)
+$(BROKER_LIB): $(BROKER_SRC:.cpp=.o) $(COMMON_LIB)
+ $(LIB_CMD) $^
+all: $(BROKER_LIB)
+UNITTESTS := $(UNITTESTS) $(wildcard test/unit/qpid/broker/*Test.cpp)
+
+# Implicit rule for unit test plugin libraries.
+%Test.so: %Test.cpp
+ $(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(COMMON_LIB) $(BROKER_LIB)
+
+## Client tests
+
+all: $(wildcard test/client/*.cpp:.cpp=)
+test/client/%: test/client/%.cpp
+ $(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 $(LINK_WITH_$(LIB)) $(LINK_WITH_$(LIB)_DEPS)
+
+## Daemon executable
+
+bin/qpidd: src/qpidd.o $(COMMON_LIB) $(BROKER_LIB)
+ $(CXX) -o $@ $(LDFLAGS) -lapr-1 $^
+all: bin/qpidd
+
+## Run unit tests.
+unittest: $(UNITTESTS:.cpp=.so)
+ DllPlugInTester -c -b $(UNITTESTS:.cpp=.so)
+
+## Run python tests
+pythontest: bin/qpidd
+ bin/qpidd > qpidd.log &
cd ../python ; ./run-tests -v -I cpp_failing.txt
-runtests:
- $(MAKE) -k unittest pythontest
-
-all:
- @for DIR in $(SUBDIRS) ; do $(MAKE) -C $$DIR all ; done
+## Doxygen documentation.
+doxygen: doxygen/doxygen.cfg $(SOURCES)
+ cd doxygen && doxygen doxygen.cfg
+
+## Cleanup
+clean::
+ rm -f bin/* lib/* qpidd.log
+ rm -rf gen
+ rm -f `find src test -name '*.o' -o -name '*.d' -o -name '*.so'`
-clean:
- @for DIR in $(SUBDIRS) ; do $(MAKE) -C $$DIR clean ; done
- @$(MAKE) -C doxygen clean
- -@rm qpidd.log
-doxygen:
- @$(MAKE) -C doxygen all
Modified: incubator/qpid/trunk/qpid/cpp/README
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=464494&r1=464493&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Mon Oct 16 06:50:26 2006
@@ -1,5 +1,7 @@
= Developer guide to C++ codebase =
+See DESIGN for design notes, Makefile comment for build system notes.
+
== Prerequisites ==
Apache Portable Runtime 1.2.7: http://apr.apache.org/
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client.xsl Mon Oct 16 06:50:26 2006
@@ -18,8 +18,8 @@
#define _AMQP_ServerProxy_
#include "AMQP_ServerOperations.h"
-#include "FieldTable.h"
-#include "OutputHandler.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/OutputHandler.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
#define _AMQP_ClientHandlerImpl_
#include "AMQP_ClientOperations.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_operations.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_operations.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_client_operations.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
#define _AMQP_ClientOperations_
#include "AMQP_Constants.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_consts.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_consts.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_consts.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_consts.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_consts.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_consts.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_consts.xsl Mon Oct 16 06:50:26 2006
@@ -51,7 +51,7 @@
#ifndef _AMQP_Constants_
#define _AMQP_Constants_
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server.xsl Mon Oct 16 06:50:26 2006
@@ -17,8 +17,8 @@
#define _AMQP_ClientProxy_
#include "AMQP_ClientOperations.h"
-#include "FieldTable.h"
-#include "OutputHandler.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/OutputHandler.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
#define _AMQP_ServerHandlerImpl_
#include "AMQP_ServerOperations.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl Mon Oct 16 06:50:26 2006
@@ -20,7 +20,7 @@
#define _AMQP_ServerOperations_
#include "AMQP_Constants.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
namespace qpid {
namespace framing {
Copied: incubator/qpid/trunk/qpid/cpp/etc/stylesheets/cpp.xsl (from r464488, incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/cpp.xsl)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/etc/stylesheets/cpp.xsl?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/cpp.xsl&r1=464488&p2=incubator/qpid/trunk/qpid/cpp/etc/stylesheets/cpp.xsl&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/framing/generated/stylesheets/cpp.xsl (original)
+++ incubator/qpid/trunk/qpid/cpp/etc/stylesheets/cpp.xsl Mon Oct 16 06:50:26 2006
@@ -16,7 +16,7 @@
<!-- processes all frames outputting the classes in a single stream -->
<xsl:template match="frames" mode="generate-single">
<xsl:result-document href="amqp_methods.h" format="textFormat">
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
<xsl:for-each select="frame">
<xsl:call-template name="generate-class">
<xsl:with-param name="f" select="."/>
@@ -29,11 +29,11 @@
<xsl:template match="frame" mode="generate-multi">
<xsl:variable name="uri" select="concat(@name, '.h')"/>
<xsl:result-document href="{$uri}" format="textFormat">
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
#include "AMQP_ServerOperations.h"
-#include "AMQMethodBody.h"
-#include "Buffer.h"
-#include "FieldTable.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
#ifndef _<xsl:value-of select="@name"/>_
#define _<xsl:value-of select="@name"/>_
@@ -201,7 +201,7 @@
<xsl:template match="frames" mode="method-list-source">
<xsl:result-document href="amqp_methods.cpp" format="textFormat">
#include "amqp_methods.h"
-#include "QpidError.h"
+#include "qpid/QpidError.h"
namespace qpid {
namespace framing {
@@ -230,8 +230,8 @@
<xsl:template match="frames" mode="generate-interface">
<xsl:result-document href="AMQPServer.h" format="textFormat">
-#include "amqp_types.h"
-#include "FieldTable.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/FieldTable.h"
#ifndef _AMQPServer_
#define _AMQPServer_
@@ -270,8 +270,8 @@
</xsl:result-document>
<xsl:result-document href="AMQPClient.h" format="textFormat">
-#include "amqp_types.h"
-#include "FieldTable.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/FieldTable.h"
#ifndef _AMQPClient_
#define _AMQPClient_
Modified: incubator/qpid/trunk/qpid/cpp/options.mk
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/options.mk?view=diff&rev=464494&r1=464493&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/options.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/options.mk Mon Oct 16 06:50:26 2006
@@ -14,25 +14,19 @@
# limitations under the License.
#
-# Directories
-SPEC_DIR = ${QPID_HOME}/specs
-QPID_CPP_HOME = ${QPID_HOME}/cpp
-COMMON_HOME = ${QPID_CPP_HOME}/common
-TOOLS_DIR = ${QPID_CPP_HOME}/tools
-LIB_DIR = ${QPID_CPP_HOME}/lib
-BIN_DIR = ${QPID_CPP_HOME}/bin
-APR_HOME = /usr/local/apr
-
-# Compile flags
-DEBUG = -ggdb3 -O0
-OPTIMIZE =
+
+## External dependencies:
+
+# Add location for headers and libraries of any external dependencies here
+EXTRA_INCLUDES := -I/usr/local/apr/include/apr-1
+EXTRA_LIBDIRS := -L/usr/local/apr/lib
+
+## Compile flags
+
+DEBUG := -ggdb3
+
# _USE_APR_IO_ set when APR IO build is desired.
-DEFINES = -D _USE_APR_IO_
-APR_INCLUDES=-I ${APR_HOME}/include/apr-1/
-COMMON_INCLUDES = -I ${COMMON_HOME}/framing/inc -I ${COMMON_HOME}/framing/generated -I ${COMMON_HOME}/concurrent/inc -I ${COMMON_HOME}/io/inc -I ${COMMON_HOME}/error/inc -I $(COMMON_HOME)/utils/inc ${APR_INCLUDES}
-SRC_INCLUDES = $(COMMON_INCLUDES) -I inc
-TEST_INCLUDES = $(COMMON_INCLUDES) -I ../inc -I $(QPID_CPP_HOME)/test/include
-INCLUDES=$(SRC_INCLUDES) # Default to src
+DEFINES := -D _USE_APR_IO_
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
@@ -41,21 +35,9 @@
# The following warnings deliberately omitted, they warn on valid code.
# -Wno-unreachable-code -Wpadded
#
-WARN = -Werror -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Winline
-
-CXXFLAGS = $(DEBUG) $(OPTIMIZE) $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES)
-
-# General link flags
-LDFLAGS= -L $(LIB_DIR) -L ${APR_HOME}/lib $(RPATH)
-
-# TODO aconway 2006-09-12: This is not something we want in a release
-# but it's useful for development.
-RPATH= -Wl,-rpath,$(CURDIR)/$(LIB_DIR)
-
-# Libraries and executables. Use absolute paths so exes can find
-# libs wherever they are run. TODO: Proper library management.
-BROKER=$(BIN_DIR)/qpidd
-BROKER_LIB=$(CURDIR)/$(LIB_DIR)/libqpid_broker.so.1.0
-COMMON_LIB=$(CURDIR)/$(LIB_DIR)/libqpid_common.so.1.0
-CLIENT_LIB=$(CURDIR)/$(LIB_DIR)/libqpid_client.so.1.0
-
+WARN := -Werror -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Winline
+INCLUDES := -Isrc -Igen $(EXTRA_INCLUDES)
+CXXFLAGS := $(DEBUG) $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES)
+## Link flags
+# Allow exes to find libs without env changes. Remove for release builds.
+LDFLAGS := -Llib $(EXTRA_LIBDIRS)
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/common/error/src/Exception.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/error/src/Exception.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/error/src/Exception.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp Mon Oct 16 06:50:26 2006
@@ -16,6 +16,6 @@
*
*/
-#include "Exception.h"
+#include "qpid/Exception.h"
qpid::Exception::~Exception() throw() {}
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/common/error/src/QpidError.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/error/src/QpidError.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/error/src/QpidError.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp Mon Oct 16 06:50:26 2006
@@ -16,7 +16,7 @@
*
*/
-#include "QpidError.h"
+#include "qpid/QpidError.h"
#include <sstream>
using namespace qpid;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h (from r463376, incubator/qpid/trunk/qpid/cpp/common/error/inc/QpidError.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/error/inc/QpidError.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/common/error/inc/QpidError.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
*
*/
#include <string>
-#include "Exception.h"
+#include "qpid/Exception.h"
namespace qpid {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/AutoDelete.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/AutoDelete.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/AutoDelete.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "AutoDelete.h"
+#include "./qpid/broker/AutoDelete.h"
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/AutoDelete.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/AutoDelete.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/AutoDelete.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h Mon Oct 16 06:50:26 2006
@@ -20,10 +20,10 @@
#include <iostream>
#include <queue>
-#include "MonitorImpl.h"
-#include "Queue.h"
-#include "QueueRegistry.h"
-#include "ThreadFactoryImpl.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/concurrent/ThreadFactoryImpl.h"
namespace qpid {
namespace broker{
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Binding.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Binding.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Binding.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
#ifndef _Binding_
#define _Binding_
-#include "FieldTable.h"
+#include "./qpid/framing/FieldTable.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/broker/src/Broker.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/Broker.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Mon Oct 16 06:50:26 2006
@@ -17,13 +17,13 @@
*/
#include <iostream>
#include <memory>
-#include "Broker.h"
-#include "Acceptor.h"
-#include "Configuration.h"
-#include "QpidError.h"
-#include "SessionHandlerFactoryImpl.h"
-#include "BlockingAPRAcceptor.h"
-#include "LFAcceptor.h"
+#include "./qpid/broker/Broker.h"
+#include "./qpid/io/Acceptor.h"
+#include "./qpid/broker/Configuration.h"
+#include "./qpid/QpidError.h"
+#include "./qpid/broker/SessionHandlerFactoryImpl.h"
+#include "./qpid/io/BlockingAPRAcceptor.h"
+#include "./qpid/io/LFAcceptor.h"
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (from r463376, incubator/qpid/trunk/qpid/cpp/broker/inc/Broker.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Broker.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Broker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Mon Oct 16 06:50:26 2006
@@ -19,10 +19,10 @@
*
*/
-#include "Acceptor.h"
-#include "Configuration.h"
-#include "Runnable.h"
-#include "SessionHandlerFactoryImpl.h"
+#include "./qpid/io/Acceptor.h"
+#include "./qpid/broker/Configuration.h"
+#include "./qpid/concurrent/Runnable.h"
+#include "./qpid/broker/SessionHandlerFactoryImpl.h"
#include <boost/noncopyable.hpp>
#include <tr1/memory>
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Channel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "Channel.h"
-#include "QpidError.h"
+#include "./qpid/broker/Channel.h"
+#include "./qpid/QpidError.h"
#include <iostream>
#include <sstream>
#include <assert.h>
@@ -124,7 +124,7 @@
}
bool Channel::ConsumerImpl::deliver(Message::shared_ptr& msg){
- if(connection != msg->getPublisher()){//check for no_local
+ if(!connection || connection != msg->getPublisher()){//check for no_local
if(ackExpected && !parent->checkPrefetch(msg)){
blocked = true;
}else{
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Channel.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Channel.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h Mon Oct 16 06:50:26 2006
@@ -20,16 +20,16 @@
#include <algorithm>
#include <map>
-#include "AMQContentBody.h"
-#include "AMQHeaderBody.h"
-#include "BasicPublishBody.h"
-#include "Binding.h"
-#include "Consumer.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "NameGenerator.h"
-#include "OutputHandler.h"
-#include "Queue.h"
+#include "./qpid/framing/AMQContentBody.h"
+#include "./qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/BasicPublishBody.h"
+#include "./qpid/broker/Binding.h"
+#include "./qpid/broker/Consumer.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/NameGenerator.h"
+#include "./qpid/framing/OutputHandler.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/broker/src/Configuration.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/Configuration.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Configuration.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "Configuration.h"
+#include "./qpid/broker/Configuration.h"
#include <string.h>
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h (from r463376, incubator/qpid/trunk/qpid/cpp/broker/inc/Configuration.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Configuration.h&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Configuration.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h Mon Oct 16 06:50:26 2006
@@ -21,7 +21,7 @@
#include <cstdlib>
#include <iostream>
#include <vector>
-#include "Exception.h"
+#include "./qpid/Exception.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Consumer.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Consumer.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Consumer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
#ifndef _Consumer_
#define _Consumer_
-#include "Message.h"
+#include "./qpid/broker/Message.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/DirectExchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/DirectExchange.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/DirectExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "DirectExchange.h"
-#include "ExchangeBinding.h"
+#include "./qpid/broker/DirectExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
#include <iostream>
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/DirectExchange.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/DirectExchange.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/DirectExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h Mon Oct 16 06:50:26 2006
@@ -20,11 +20,11 @@
#include <map>
#include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Exchange.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Exchange.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Exchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Mon Oct 16 06:50:26 2006
@@ -18,9 +18,9 @@
#ifndef _Exchange_
#define _Exchange_
-#include "FieldTable.h"
-#include "Message.h"
-#include "Queue.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeBinding.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeBinding.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeBinding.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "ExchangeBinding.h"
-#include "Exchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
+#include "./qpid/broker/Exchange.h"
using namespace qpid::broker;
using namespace qpid::framing;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeBinding.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeBinding.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeBinding.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h Mon Oct 16 06:50:26 2006
@@ -18,9 +18,9 @@
#ifndef _ExchangeBinding_
#define _ExchangeBinding_
-#include "Binding.h"
-#include "FieldTable.h"
-#include "Queue.h"
+#include "./qpid/broker/Binding.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeRegistry.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeRegistry.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/ExchangeRegistry.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "ExchangeRegistry.h"
-#include "MonitorImpl.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/concurrent/MonitorImpl.h"
using namespace qpid::broker;
using namespace qpid::concurrent;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeRegistry.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeRegistry.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/ExchangeRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Mon Oct 16 06:50:26 2006
@@ -19,8 +19,8 @@
#define _ExchangeRegistry_
#include <map>
-#include "Exchange.h"
-#include "Monitor.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/concurrent/Monitor.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/FanOutExchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/FanOutExchange.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/FanOutExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "FanOutExchange.h"
-#include "ExchangeBinding.h"
+#include "./qpid/broker/FanOutExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
#include <algorithm>
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/FanOutExchange.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/FanOutExchange.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/FanOutExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h Mon Oct 16 06:50:26 2006
@@ -20,11 +20,11 @@
#include <map>
#include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/HeadersExchange.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/HeadersExchange.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/HeadersExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
* limitations under the License.
*
*/
-#include "HeadersExchange.h"
-#include "ExchangeBinding.h"
-#include "Value.h"
-#include "QpidError.h"
+#include "./qpid/broker/HeadersExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
+#include "./qpid/framing/Value.h"
+#include "./qpid/QpidError.h"
#include <algorithm>
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/HeadersExchange.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/HeadersExchange.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/HeadersExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h Mon Oct 16 06:50:26 2006
@@ -19,11 +19,11 @@
#define _HeadersExchange_
#include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Message.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/Message.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Message.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
* limitations under the License.
*
*/
-#include "MonitorImpl.h"
-#include "Message.h"
-#include "ExchangeRegistry.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/broker/ExchangeRegistry.h"
#include <iostream>
using namespace std::tr1;//for *_pointer_cast methods
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Message.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Message.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Mon Oct 16 06:50:26 2006
@@ -18,13 +18,13 @@
#ifndef _Message_
#define _Message_
-#include "memory.h"
-#include "AMQContentBody.h"
-#include "AMQHeaderBody.h"
-#include "BasicHeaderProperties.h"
-#include "BasicPublishBody.h"
-#include "ConnectionToken.h"
-#include "OutputHandler.h"
+#include "./memory.h"
+#include "./qpid/framing/AMQContentBody.h"
+#include "./qpid/framing/AMQHeaderBody.h"
+#include "./qpid/framing/BasicHeaderProperties.h"
+#include "./qpid/framing/BasicPublishBody.h"
+#include "./qpid/broker/ConnectionToken.h"
+#include "./qpid/framing/OutputHandler.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/NameGenerator.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/NameGenerator.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/NameGenerator.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "NameGenerator.h"
+#include "./qpid/broker/NameGenerator.h"
#include <sstream>
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/NameGenerator.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/NameGenerator.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/NameGenerator.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h Mon Oct 16 06:50:26 2006
@@ -18,7 +18,7 @@
#ifndef _NameGenerator_
#define _NameGenerator_
-#include "Message.h"
+#include "./qpid/broker/Message.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Queue.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/Queue.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Mon Oct 16 06:50:26 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "Queue.h"
-#include "MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
+#include "./qpid/concurrent/MonitorImpl.h"
#include <iostream>
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Queue.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Queue.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Mon Oct 16 06:50:26 2006
@@ -20,14 +20,14 @@
#include <vector>
#include <queue>
-#include "memory.h"
+#include "./memory.h"
#include "apr_time.h"
-#include "amqp_types.h"
-#include "Binding.h"
-#include "ConnectionToken.h"
-#include "Consumer.h"
-#include "Message.h"
-#include "MonitorImpl.h"
+#include "./qpid/framing/amqp_types.h"
+#include "./qpid/broker/Binding.h"
+#include "./qpid/broker/ConnectionToken.h"
+#include "./qpid/broker/Consumer.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/QueueRegistry.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/QueueRegistry.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/QueueRegistry.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp Mon Oct 16 06:50:26 2006
@@ -15,9 +15,9 @@
* limitations under the License.
*
*/
-#include "QueueRegistry.h"
-#include "MonitorImpl.h"
-#include "SessionHandlerImpl.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/SessionHandlerImpl.h"
#include <sstream>
#include <assert.h>
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/QueueRegistry.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/QueueRegistry.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/QueueRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h Mon Oct 16 06:50:26 2006
@@ -19,8 +19,8 @@
#define _QueueRegistry_
#include <map>
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/Router.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/Router.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/Router.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.cpp Mon Oct 16 06:50:26 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "Router.h"
+#include "./qpid/broker/Router.h"
using namespace qpid::broker;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/Router.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/Router.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/Router.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Router.h Mon Oct 16 06:50:26 2006
@@ -18,8 +18,8 @@
#ifndef _Router_
#define _Router_
-#include "ExchangeRegistry.h"
-#include "Message.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/broker/Message.h"
/**
* A routing functor
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerFactoryImpl.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerFactoryImpl.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerFactoryImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp Mon Oct 16 06:50:26 2006
@@ -15,10 +15,10 @@
* limitations under the License.
*
*/
-#include "SessionHandlerFactoryImpl.h"
-#include "SessionHandlerImpl.h"
-#include "FanOutExchange.h"
-#include "HeadersExchange.h"
+#include "./qpid/broker/SessionHandlerFactoryImpl.h"
+#include "./qpid/broker/SessionHandlerImpl.h"
+#include "./qpid/broker/FanOutExchange.h"
+#include "./qpid/broker/HeadersExchange.h"
using namespace qpid::broker;
using namespace qpid::io;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerFactoryImpl.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerFactoryImpl.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerFactoryImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h Mon Oct 16 06:50:26 2006
@@ -18,14 +18,14 @@
#ifndef _SessionHandlerFactoryImpl_
#define _SessionHandlerFactoryImpl_
-#include "AMQFrame.h"
-#include "AutoDelete.h"
-#include "DirectExchange.h"
-#include "ExchangeRegistry.h"
-#include "ProtocolInitiation.h"
-#include "QueueRegistry.h"
-#include "SessionHandlerFactory.h"
-#include "TimeoutHandler.h"
+#include "./qpid/framing/AMQFrame.h"
+#include "./qpid/broker/AutoDelete.h"
+#include "./qpid/broker/DirectExchange.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/framing/ProtocolInitiation.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/io/SessionHandlerFactory.h"
+#include "./qpid/io/TimeoutHandler.h"
namespace qpid {
namespace broker {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerImpl.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerImpl.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/src/SessionHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp Mon Oct 16 06:50:26 2006
@@ -16,11 +16,11 @@
*
*/
#include <iostream>
-#include "SessionHandlerImpl.h"
-#include "FanOutExchange.h"
-#include "HeadersExchange.h"
-#include "Router.h"
-#include "TopicExchange.h"
+#include "./qpid/broker/SessionHandlerImpl.h"
+#include "./qpid/broker/FanOutExchange.h"
+#include "./qpid/broker/HeadersExchange.h"
+#include "./qpid/broker/Router.h"
+#include "./qpid/broker/TopicExchange.h"
#include "assert.h"
using namespace std::tr1;
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h (from r463084, incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerImpl.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerImpl.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h&r2=464494
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/broker/inc/SessionHandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h Mon Oct 16 06:50:26 2006
@@ -22,21 +22,21 @@
#include <sstream>
#include <vector>
#include <exception>
-#include "AMQFrame.h"
-#include "AMQP_ClientProxy.h"
-#include "AMQP_ServerOperations.h"
-#include "AutoDelete.h"
-#include "ExchangeRegistry.h"
-#include "Channel.h"
-#include "ConnectionToken.h"
-#include "DirectExchange.h"
-#include "OutputHandler.h"
-#include "ProtocolInitiation.h"
-#include "QueueRegistry.h"
-#include "SessionContext.h"
-#include "SessionHandler.h"
-#include "TimeoutHandler.h"
-#include "TopicExchange.h"
+#include "./qpid/framing/AMQFrame.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "./qpid/broker/AutoDelete.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/broker/Channel.h"
+#include "./qpid/broker/ConnectionToken.h"
+#include "./qpid/broker/DirectExchange.h"
+#include "./qpid/framing/OutputHandler.h"
+#include "./qpid/framing/ProtocolInitiation.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/io/SessionContext.h"
+#include "./qpid/io/SessionHandler.h"
+#include "./qpid/io/TimeoutHandler.h"
+#include "./qpid/broker/TopicExchange.h"
namespace qpid {
namespace broker {