You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2007/04/02 13:40:57 UTC
svn commit: r524769 [1/3] - in /incubator/qpid/trunk/qpid/cpp: ./ gen/
gentools/templ.cpp/ lib/ src/ src/broker/ src/client/ src/framing/ src/gen/
src/sys/ src/sys/apr/ src/sys/posix/ src/tests/ tests/
Author: astitcher
Date: Mon Apr 2 04:40:48 2007
New Revision: 524769
URL: http://svn.apache.org/viewvc?view=rev&rev=524769
Log:
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.
Added:
incubator/qpid/trunk/qpid/cpp/src/Exception.cpp
- copied, changed from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/Exception.cpp
incubator/qpid/trunk/qpid/cpp/src/Exception.h
- copied, changed from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/Exception.h
incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.cpp
- copied unchanged from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/ExceptionHolder.cpp
incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h
- copied, changed from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/ExceptionHolder.h
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
- copied, changed from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp
- copied, changed from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.cpp
incubator/qpid/trunk/qpid/cpp/src/QpidError.h
- copied, changed from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.h
incubator/qpid/trunk/qpid/cpp/src/SharedObject.h
- copied unchanged from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/SharedObject.h
incubator/qpid/trunk/qpid/cpp/src/broker/
- copied from r524754, incubator/qpid/trunk/qpid/cpp/lib/broker/
incubator/qpid/trunk/qpid/cpp/src/client/
- copied from r524754, incubator/qpid/trunk/qpid/cpp/lib/client/
incubator/qpid/trunk/qpid/cpp/src/doxygen_mainpage.h
- copied unchanged from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/doxygen_mainpage.h
incubator/qpid/trunk/qpid/cpp/src/framing/
- copied from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/framing/
incubator/qpid/trunk/qpid/cpp/src/gen/
- copied from r524754, incubator/qpid/trunk/qpid/cpp/gen/
incubator/qpid/trunk/qpid/cpp/src/shared_ptr.h
- copied unchanged from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/shared_ptr.h
incubator/qpid/trunk/qpid/cpp/src/sys/
- copied from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/sys/
incubator/qpid/trunk/qpid/cpp/src/tests/
- copied from r524754, incubator/qpid/trunk/qpid/cpp/tests/
Removed:
incubator/qpid/trunk/qpid/cpp/gen/
incubator/qpid/trunk/qpid/cpp/lib/
incubator/qpid/trunk/qpid/cpp/tests/
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile.am
incubator/qpid/trunk/qpid/cpp/bootstrap
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.h
incubator/qpid/trunk/qpid/cpp/src/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/Broker.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerExchange.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageBase.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.h
incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.h
incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h
incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.h
incubator/qpid/trunk/qpid/cpp/src/broker/Consumer.h
incubator/qpid/trunk/qpid/cpp/src/broker/Content.h
incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.h
incubator/qpid/trunk/qpid/cpp/src/broker/Deliverable.h
incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.h
incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.h
incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.h
incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.h
incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.h
incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.h
incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.h
incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.h
incubator/qpid/trunk/qpid/cpp/src/broker/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h
incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.h
incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.h
incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.h
incubator/qpid/trunk/qpid/cpp/src/broker/Persistable.h
incubator/qpid/trunk/qpid/cpp/src/broker/PersistableMessage.h
incubator/qpid/trunk/qpid/cpp/src/broker/Prefetch.h
incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.h
incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.h
incubator/qpid/trunk/qpid/cpp/src/broker/RecoverableMessage.h
incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManager.h
incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManagerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.h
incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.h
incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.h
incubator/qpid/trunk/qpid/cpp/src/broker/TxOp.h
incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.cpp
incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.h
incubator/qpid/trunk/qpid/cpp/src/client/BasicMessageChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.h
incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.h
incubator/qpid/trunk/qpid/cpp/src/client/ClientExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/client/ClientMessage.h
incubator/qpid/trunk/qpid/cpp/src/client/ClientQueue.cpp
incubator/qpid/trunk/qpid/cpp/src/client/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/client/Connector.cpp
incubator/qpid/trunk/qpid/cpp/src/client/Connector.h
incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/client/IncomingMessage.h
incubator/qpid/trunk/qpid/cpp/src/client/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/client/MessageChannel.h
incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.cpp
incubator/qpid/trunk/qpid/cpp/src/client/MessageListener.h
incubator/qpid/trunk/qpid/cpp/src/client/MethodBodyInstances.h
incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/client/ResponseHandler.h
incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/client/ReturnedMessageHandler.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/AMQBody.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/AMQContentBody.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQDataBlock.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeaderBody.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/AMQHeartbeatBody.h
incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h
incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/BasicHeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/framing/BodyHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/Buffer.h
incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/ChannelAdapter.h
incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/FieldTable.h
incubator/qpid/trunk/qpid/cpp/src/framing/FramingContent.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/HeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/InitiationHandler.h
incubator/qpid/trunk/qpid/cpp/src/framing/InputHandler.h
incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolInitiation.h
incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersion.h
incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/ProtocolVersionException.h
incubator/qpid/trunk/qpid/cpp/src/framing/Requester.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/Responder.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/Value.cpp
incubator/qpid/trunk/qpid/cpp/src/framing/Value.h
incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h
incubator/qpid/trunk/qpid/cpp/src/framing/amqp_types.h
incubator/qpid/trunk/qpid/cpp/src/gen/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/Acceptor.h
incubator/qpid/trunk/qpid/cpp/src/sys/Condition.h
incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionInputHandler.h
incubator/qpid/trunk/qpid/cpp/src/sys/ConnectionOutputHandler.h
incubator/qpid/trunk/qpid/cpp/src/sys/Module.h
incubator/qpid/trunk/qpid/cpp/src/sys/Monitor.h
incubator/qpid/trunk/qpid/cpp/src/sys/Mutex.h
incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/ProducerConsumer.h
incubator/qpid/trunk/qpid/cpp/src/sys/Socket.h
incubator/qpid/trunk/qpid/cpp/src/sys/Thread.h
incubator/qpid/trunk/qpid/cpp/src/sys/ThreadSafeQueue.h
incubator/qpid/trunk/qpid/cpp/src/sys/Time.h
incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRBase.h
incubator/qpid/trunk/qpid/cpp/src/sys/apr/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFSessionContext.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/apr/LFSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/sys/apr/Socket.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/apr/Thread.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannel.h
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelConnection.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelConnection.h
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelThreads.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/EventChannelThreads.h
incubator/qpid/trunk/qpid/cpp/src/sys/posix/PosixAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/Socket.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/Thread.cpp
incubator/qpid/trunk/qpid/cpp/src/sys/posix/check.h
incubator/qpid/trunk/qpid/cpp/src/tests/APRBaseTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/AccumulatedAckTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ConfigurationTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelConnectionTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/EventChannelThreadsTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/FieldTableTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/HeaderTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/HeadersExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h
incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
incubator/qpid/trunk/qpid/cpp/src/tests/MockConnectionInputHandler.h
incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueuePolicyTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TopicExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxBufferTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/ValueTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/client_test.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Mon Apr 2 04:40:48 2007
@@ -7,7 +7,7 @@
$(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)
Modified: incubator/qpid/trunk/qpid/cpp/bootstrap
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/bootstrap?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/bootstrap (original)
+++ incubator/qpid/trunk/qpid/cpp/bootstrap Mon Apr 2 04:40:48 2007
@@ -17,13 +17,13 @@
# 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 )
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Mon Apr 2 04:40:48 2007
@@ -16,7 +16,7 @@
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 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl Mon Apr 2 04:40:48 2007
@@ -31,7 +31,7 @@
#include <sstream>
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
namespace qpid {
namespace framing {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl Mon Apr 2 04:40:48 2007
@@ -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}
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl Mon Apr 2 04:40:48 2007
@@ -28,7 +28,7 @@
#ifndef qpid_framing_highestProtocolVersion__
#define qpid_framing_highestProtocolVersion__
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl Mon Apr 2 04:40:48 2007
@@ -27,7 +27,7 @@
*/
#include <sstream>
-#include "../lib/common/framing/ProtocolVersionException.h"
+#include "../framing/ProtocolVersionException.h"
#include "AMQP_MethodVersionMap.h"
namespace qpid
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl Mon Apr 2 04:40:48 2007
@@ -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}
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl Mon Apr 2 04:40:48 2007
@@ -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}
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl?view=diff&rev=524769&r1=524768&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl Mon Apr 2 04:40:48 2007
@@ -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
{
Copied: incubator/qpid/trunk/qpid/cpp/src/Exception.cpp (from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/Exception.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Exception.cpp?view=diff&rev=524769&p1=incubator/qpid/trunk/qpid/cpp/lib/common/Exception.cpp&r1=524754&p2=incubator/qpid/trunk/qpid/cpp/src/Exception.cpp&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Exception.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Exception.cpp Mon Apr 2 04:40:48 2007
@@ -19,7 +19,7 @@
*
*/
-#include <Exception.h>
+#include "Exception.h"
namespace qpid {
Copied: incubator/qpid/trunk/qpid/cpp/src/Exception.h (from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/Exception.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Exception.h?view=diff&rev=524769&p1=incubator/qpid/trunk/qpid/cpp/lib/common/Exception.h&r1=524754&p2=incubator/qpid/trunk/qpid/cpp/src/Exception.h&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Exception.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Exception.h Mon Apr 2 04:40:48 2007
@@ -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
{
Copied: incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h (from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/ExceptionHolder.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h?view=diff&rev=524769&p1=incubator/qpid/trunk/qpid/cpp/lib/common/ExceptionHolder.h&r1=524754&p2=incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/ExceptionHolder.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/ExceptionHolder.h Mon Apr 2 04:40:48 2007
@@ -20,7 +20,7 @@
*/
#include <assert.h>
-#include <Exception.h>
+#include "Exception.h"
#include <boost/shared_ptr.hpp>
namespace qpid {
Copied: incubator/qpid/trunk/qpid/cpp/src/Makefile.am (from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=524769&p1=incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am&r1=524754&p2=incubator/qpid/trunk/qpid/cpp/src/Makefile.am&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Mon Apr 2 04:40:48 2007
@@ -1,11 +1,18 @@
+SUBDIRS = broker . client tests gen
+
AM_CXXFLAGS = $(WARNING_CFLAGS)
INCLUDES = \
- -I$(top_srcdir)/gen \
- -I$(top_srcdir)/lib/common/sys \
- -I$(top_srcdir)/lib/common/framing \
+ -I$(srcdir)/gen \
$(APR_CXXFLAGS)
+qpidd_LDADD = \
+ broker/libqpidbroker.la \
+ libqpidcommon.la
+
+sbin_PROGRAMS = qpidd
+qpidd_SOURCES = qpidd.cpp
+
apr = sys/apr
apr_src = \
$(apr)/APRAcceptor.cpp \
@@ -41,7 +48,7 @@
platform_hdr = $(apr_hdr)
framing = framing
-gen = $(srcdir)/../../gen
+gen = gen
lib_LTLIBRARIES = libqpidcommon.la
libqpidcommon_la_LIBADD = \
@@ -140,4 +147,4 @@
# Force build during dist phase so help2man will work.
-dist-hook: $(lib_LTLIBRARIES)
+dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS)
Copied: incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp (from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp?view=diff&rev=524769&p1=incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.cpp&r1=524754&p2=incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/QpidError.cpp Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#include <boost/format.hpp>
-#include <QpidError.h>
+#include "QpidError.h"
#include <sstream>
using namespace qpid;
Copied: incubator/qpid/trunk/qpid/cpp/src/QpidError.h (from r524754, incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.h)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/QpidError.h?view=diff&rev=524769&p1=incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.h&r1=524754&p2=incubator/qpid/trunk/qpid/cpp/src/QpidError.h&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/QpidError.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/QpidError.h Mon Apr 2 04:40:48 2007
@@ -24,7 +24,7 @@
#include <memory>
#include <ostream>
-#include <Exception.h>
+#include "Exception.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/AutoDelete.h Mon Apr 2 04:40:48 2007
@@ -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{
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Broker.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Broker.cpp Mon Apr 2 04:40:48 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Broker.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Broker.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Broker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Broker.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.cpp Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#include "AMQP_ServerOperations.h"
#include "HandlerImpl.h"
#include "MessageHandlerImpl.h"
-#include "Exception.h"
+#include "../Exception.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.cpp Mon Apr 2 04:40:48 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h Mon Apr 2 04:40:48 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerExchange.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerExchange.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageBase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageBase.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageBase.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp Mon Apr 2 04:40:48 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h Mon Apr 2 04:40:48 2007
@@ -23,7 +23,7 @@
*/
#include "BrokerMessageBase.h"
#include "MessageTransferBody.h"
-#include "amqp_types.h"
+#include "../framing/amqp_types.h"
#include <vector>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.cpp Mon Apr 2 04:40:48 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerQueue.h Mon Apr 2 04:40:48 2007
@@ -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.
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.h Mon Apr 2 04:40:48 2007
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <iostream>
#include <vector>
-#include <Exception.h>
+#include "../Exception.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <ConnectionFactory.h>
+#include "ConnectionFactory.h"
#include "Connection.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/ConnectionFactory.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _ConnectionFactory_
#define _ConnectionFactory_
-#include "ConnectionInputHandlerFactory.h"
+#include "../sys/ConnectionInputHandlerFactory.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Consumer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Consumer.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Consumer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Consumer.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _Consumer_
#define _Consumer_
-#include <BrokerMessage.h>
+#include "BrokerMessage.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Content.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Content.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Content.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Content.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <DeletingTxOp.h>
+#include "DeletingTxOp.h"
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DeletingTxOp.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _DeletingTxOp_
#define _DeletingTxOp_
-#include <TxOp.h>
+#include "TxOp.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Deliverable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Deliverable.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Deliverable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Deliverable.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _Deliverable_
#define _Deliverable_
-#include <BrokerQueue.h>
+#include "BrokerQueue.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <DeliverableMessage.h>
+#include "DeliverableMessage.h"
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DeliverableMessage.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DeliveryRecord.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <DirectExchange.h>
+#include "DirectExchange.h"
#include <iostream>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/DirectExchange.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/ExchangeRegistry.h Mon Apr 2 04:40:48 2007
@@ -23,8 +23,8 @@
*/
#include <map>
-#include <BrokerExchange.h>
-#include <sys/Monitor.h>
+#include "BrokerExchange.h"
+#include "../sys/Monitor.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <FanOutExchange.h>
+#include "FanOutExchange.h"
#include <algorithm>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/FanOutExchange.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.cpp Mon Apr 2 04:40:48 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/HeadersExchange.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/InMemoryContent.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _InMemoryContent_
#define _InMemoryContent_
-#include <Content.h>
+#include "Content.h"
#include <vector>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/LazyLoadedContent.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Makefile.am?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Makefile.am Mon Apr 2 04:40:48 2007
@@ -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 \
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.cpp Mon Apr 2 04:40:48 2007
@@ -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;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp Mon Apr 2 04:40:48 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.cpp Mon Apr 2 04:40:48 2007
@@ -19,7 +19,7 @@
*
*/
-#include <MessageStoreModule.h>
+#include "MessageStoreModule.h"
#include <iostream>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageStoreModule.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <NameGenerator.h>
+#include "NameGenerator.h"
#include <sstream>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/NameGenerator.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _NameGenerator_
#define _NameGenerator_
-#include <BrokerMessage.h>
+#include "BrokerMessage.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.cpp Mon Apr 2 04:40:48 2007
@@ -19,9 +19,9 @@
*
*/
-#include <NullMessageStore.h>
+#include "NullMessageStore.h"
-#include <RecoveryManager.h>
+#include "RecoveryManager.h"
#include <iostream>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/NullMessageStore.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Persistable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Persistable.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Persistable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Persistable.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/PersistableMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/PersistableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/PersistableMessage.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Prefetch.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Prefetch.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Prefetch.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Prefetch.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _Prefetch_
#define _Prefetch_
-#include <amqp_types.h>
+#include "../framing/amqp_types.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <QueuePolicy.h>
+#include "QueuePolicy.h"
using namespace qpid::broker;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/QueuePolicy.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _QueuePolicy_
#define _QueuePolicy_
-#include <FieldTable.h>
+#include "../framing/FieldTable.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <QueueRegistry.h>
+#include "QueueRegistry.h"
#include <sstream>
#include <assert.h>
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/QueueRegistry.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/RecoverableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/RecoverableMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/RecoverableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/RecoverableMessage.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManager.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManager.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManager.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManager.h Mon Apr 2 04:40:48 2007
@@ -23,7 +23,7 @@
#include "RecoverableQueue.h"
#include "RecoverableMessage.h"
-#include "framing/Buffer.h"
+#include "../framing/Buffer.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManagerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManagerImpl.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManagerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/RecoveryManagerImpl.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <RecoveryManagerImpl.h>
+#include "RecoveryManagerImpl.h"
#include "BrokerMessage.h"
#include "BrokerMessageMessage.h"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp Mon Apr 2 04:40:48 2007
@@ -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"
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TopicExchange.h>
+#include "TopicExchange.h"
#include <algorithm>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TopicExchange.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TxAck.h>
+#include "TxAck.h"
using std::bind1st;
using std::bind2nd;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxAck.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TxBuffer.h>
+#include "TxBuffer.h"
using std::mem_fun;
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxBuffer.h Mon Apr 2 04:40:48 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxOp.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxOp.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxOp.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxOp.h Mon Apr 2 04:40:48 2007
@@ -21,7 +21,7 @@
#ifndef _TxOp_
#define _TxOp_
-#include <TransactionalStore.h>
+#include "TransactionalStore.h"
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.cpp Mon Apr 2 04:40:48 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include <TxPublish.h>
+#include "TxPublish.h"
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/TxPublish.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/client/BasicMessageChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/BasicMessageChannel.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/BasicMessageChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/BasicMessageChannel.cpp Mon Apr 2 04:40:48 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.h Mon Apr 2 04:40:48 2007
@@ -19,7 +19,7 @@
*
*/
-#include "ChannelAdapter.h"
+#include "../framing/ChannelAdapter.h"
#include "ClientChannel.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.cpp Mon Apr 2 04:40:48 2007
@@ -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:
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientChannel.h Mon Apr 2 04:40:48 2007
@@ -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 {
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientExchange.cpp?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientExchange.cpp Mon Apr 2 04:40:48 2007
@@ -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; }
Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientMessage.h?view=diff&rev=524769&r1=524754&r2=524769
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientMessage.h Mon Apr 2 04:40:48 2007
@@ -22,7 +22,7 @@
*
*/
#include <string>
-#include "framing/BasicHeaderProperties.h"
+#include "../framing/BasicHeaderProperties.h"
namespace qpid {
namespace client {