diff options
| author | Alan Conway <aconway@apache.org> | 2009-07-14 14:32:39 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-07-14 14:32:39 +0000 |
| commit | c7b58ba05104496a96cce3c7acd035253fd89f79 (patch) | |
| tree | 6fb65c261f7ac7e53e8d9360e79e39635046a0b5 /cpp | |
| parent | d2e4e9a156c15bfc4c11fd0e6088940caabd5339 (diff) | |
| download | qpid-python-c7b58ba05104496a96cce3c7acd035253fd89f79.tar.gz | |
Add directory to #include
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793909 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
507 files changed, 1057 insertions, 1112 deletions
diff --git a/cpp/rubygen/0-10/handlers.rb b/cpp/rubygen/0-10/handlers.rb index db4fdc871b..981ea890e6 100755 --- a/cpp/rubygen/0-10/handlers.rb +++ b/cpp/rubygen/0-10/handlers.rb @@ -35,7 +35,7 @@ class GenHandlers < CppGen def generate() h_file("#{@dir}/handlers.h") { - include "specification" + include "#{@dir}/specification" namespace("#{@ns}") { action_handler "Command", @amqp.collect_all(AmqpCommand) action_handler "Control", @amqp.collect_all(AmqpControl) diff --git a/cpp/rubygen/0-10/specification.rb b/cpp/rubygen/0-10/specification.rb index e27ad00231..7366599eba 100755 --- a/cpp/rubygen/0-10/specification.rb +++ b/cpp/rubygen/0-10/specification.rb @@ -342,8 +342,8 @@ class Specification < CppGen } cpp_file("#{@dir}/#{name}") { - include "#{name}" - include "exceptions.h" + include "#{@dir}/#{name}" + include "#{@dir}/exceptions.h" namespace(@ns) { genl "using framing::in_place;" genl diff --git a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb b/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb index 3bacdbd812..00962de4f9 100755 --- a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb +++ b/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb @@ -42,7 +42,7 @@ class MethodBodyDefaultVisitorGen < CppGen cpp_file(@filename) { include(@filename) - include("all_method_bodies.h") + include("qpid/framing/all_method_bodies.h") namespace(@namespace) { @amqp.methods_.each { |m| genl "void #{@classname}::visit(const #{m.body_name}& b) { defaultVisit(b); }" diff --git a/cpp/rubygen/framing.0-10/Proxy.rb b/cpp/rubygen/framing.0-10/Proxy.rb index 7e11d62d9b..6e3cb4fd4d 100755 --- a/cpp/rubygen/framing.0-10/Proxy.rb +++ b/cpp/rubygen/framing.0-10/Proxy.rb @@ -86,7 +86,7 @@ EOS # .cpp file cpp_file(@filename) { include "<sstream>" - include "#{@classname}.h" + include "qpid/framing/#{@classname}.h" include "qpid/framing/amqp_types_full.h" methods_on(@amqp, @chassis).each { |m| include "qpid/framing/"+m.body_name diff --git a/cpp/rubygen/framing.0-10/Session.rb b/cpp/rubygen/framing.0-10/Session.rb index e681a4a23d..7b92a17f41 100644..100755 --- a/cpp/rubygen/framing.0-10/Session.rb +++ b/cpp/rubygen/framing.0-10/Session.rb @@ -158,7 +158,7 @@ class SessionNoKeywordGen < CppGen }} cpp_file(@file) { - include @classname + include "qpid/client/#{@classname}" include "qpid/framing/all_method_bodies.h" include "qpid/client/SessionImpl.h" include "qpid/client/MessageImpl.h" diff --git a/cpp/rubygen/framing.0-10/constants.rb b/cpp/rubygen/framing.0-10/constants.rb index fa2031b0ce..ea74c82f73 100755 --- a/cpp/rubygen/framing.0-10/constants.rb +++ b/cpp/rubygen/framing.0-10/constants.rb @@ -164,7 +164,7 @@ EOS h_file("#{@dir}/reply_exceptions") { include "qpid/Exception" include "qpid/sys/ExceptionHolder" - include "enum" + include "qpid/framing/enum" include "qpid/CommonImportExport.h" namespace(@namespace) { declare_exceptions("execution", "error-code", "SessionException") diff --git a/cpp/rubygen/framing.0-10/structs.rb b/cpp/rubygen/framing.0-10/structs.rb index 8ea8a91172..823d062dd5 100644..100755 --- a/cpp/rubygen/framing.0-10/structs.rb +++ b/cpp/rubygen/framing.0-10/structs.rb @@ -462,9 +462,8 @@ EOS buffer = "/*buffer*/" end gen <<EOS -#include "#{classname}.h" - -#include "reply_exceptions.h" +#include "qpid/framing/#{classname}.h" +#include "qpid/framing/reply_exceptions.h" using namespace qpid::framing; @@ -605,7 +604,7 @@ EOS structs.each { |s| define_struct(s) } @amqp.methods_.each { |m| define_struct(m) } #generate a single include file containing the list of structs for convenience - h_file("qpid/framing/amqp_structs.h") { structs.each { |s| genl "#include \"#{s.cppname}.h\"" } } + h_file("qpid/framing/amqp_structs.h") { structs.each { |s| genl "#include \"qpid/framing/#{s.cppname}.h\"" } } end end diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 75ba30525b..541e81a7f6 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -596,7 +596,6 @@ nobase_include_HEADERS = \ qpid/broker/TxOpVisitor.h \ qpid/broker/TxPublish.h \ qpid/broker/Vhost.h \ - qpid/client/AckMode.h \ qpid/client/Bounds.h \ qpid/client/ChainableFrameHandler.h \ qpid/client/ClientImportExport.h \ diff --git a/cpp/src/qmf/Agent.cpp b/cpp/src/qmf/Agent.cpp index e4aeca8a84..64d34f7ecd 100644 --- a/cpp/src/qmf/Agent.cpp +++ b/cpp/src/qmf/Agent.cpp @@ -17,14 +17,14 @@ * under the License. */ -#include "Agent.h" -#include "MessageImpl.h" -#include "SchemaImpl.h" -#include "Typecode.h" -#include "ObjectImpl.h" -#include "ObjectIdImpl.h" -#include "QueryImpl.h" -#include "ValueImpl.h" +#include "qmf/Agent.h" +#include "qmf/MessageImpl.h" +#include "qmf/SchemaImpl.h" +#include "qmf/Typecode.h" +#include "qmf/ObjectImpl.h" +#include "qmf/ObjectIdImpl.h" +#include "qmf/QueryImpl.h" +#include "qmf/ValueImpl.h" #include <qpid/framing/Buffer.h> #include <qpid/framing/Uuid.h> #include <qpid/framing/FieldTable.h> diff --git a/cpp/src/qmf/MessageImpl.cpp b/cpp/src/qmf/MessageImpl.cpp index 0f3dd7caaf..f2625c7202 100644 --- a/cpp/src/qmf/MessageImpl.cpp +++ b/cpp/src/qmf/MessageImpl.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "MessageImpl.h" +#include "qmf/MessageImpl.h" #include <string.h> using namespace std; diff --git a/cpp/src/qmf/MessageImpl.h b/cpp/src/qmf/MessageImpl.h index 618e2c1940..137f435699 100644 --- a/cpp/src/qmf/MessageImpl.h +++ b/cpp/src/qmf/MessageImpl.h @@ -20,7 +20,7 @@ * under the License. */ -#include "Message.h" +#include "qmf/Message.h" #include <string> #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qmf/ObjectIdImpl.cpp b/cpp/src/qmf/ObjectIdImpl.cpp index 83fd6cc34f..efa8e7119b 100644 --- a/cpp/src/qmf/ObjectIdImpl.cpp +++ b/cpp/src/qmf/ObjectIdImpl.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "ObjectIdImpl.h" +#include "qmf/ObjectIdImpl.h" #include <stdlib.h> using namespace std; diff --git a/cpp/src/qmf/ObjectImpl.cpp b/cpp/src/qmf/ObjectImpl.cpp index d00dd89b3d..d3882935e4 100644 --- a/cpp/src/qmf/ObjectImpl.cpp +++ b/cpp/src/qmf/ObjectImpl.cpp @@ -17,8 +17,8 @@ * under the License. */ -#include "ObjectImpl.h" -#include "ValueImpl.h" +#include "qmf/ObjectImpl.h" +#include "qmf/ValueImpl.h" #include <qpid/sys/Time.h> using namespace std; diff --git a/cpp/src/qmf/QueryImpl.cpp b/cpp/src/qmf/QueryImpl.cpp index f74d9238ae..7e827796bb 100644 --- a/cpp/src/qmf/QueryImpl.cpp +++ b/cpp/src/qmf/QueryImpl.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "QueryImpl.h" +#include "qmf/QueryImpl.h" using namespace std; using namespace qmf; diff --git a/cpp/src/qmf/ResilientConnection.cpp b/cpp/src/qmf/ResilientConnection.cpp index 3a32d11df4..66d76266ce 100644 --- a/cpp/src/qmf/ResilientConnection.cpp +++ b/cpp/src/qmf/ResilientConnection.cpp @@ -17,8 +17,8 @@ * under the License. */ -#include "ResilientConnection.h" -#include "MessageImpl.h" +#include "qmf/ResilientConnection.h" +#include "qmf/MessageImpl.h" #include <qpid/client/Session.h> #include <qpid/client/MessageListener.h> #include <qpid/client/SubscriptionManager.h> diff --git a/cpp/src/qmf/SchemaImpl.cpp b/cpp/src/qmf/SchemaImpl.cpp index 716c4db4f0..665c94f2a1 100644 --- a/cpp/src/qmf/SchemaImpl.cpp +++ b/cpp/src/qmf/SchemaImpl.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "SchemaImpl.h" +#include "qmf/SchemaImpl.h" #include <qpid/framing/Buffer.h> #include <qpid/framing/FieldTable.h> #include <string> diff --git a/cpp/src/qmf/SchemaImpl.h b/cpp/src/qmf/SchemaImpl.h index fbc156c538..2c30a8851f 100644 --- a/cpp/src/qmf/SchemaImpl.h +++ b/cpp/src/qmf/SchemaImpl.h @@ -20,7 +20,7 @@ * under the License. */ -#include "Schema.h" +#include "qmf/Schema.h" #include <string> #include <vector> #include <qpid/framing/Buffer.h> diff --git a/cpp/src/qmf/ValueImpl.cpp b/cpp/src/qmf/ValueImpl.cpp index 538255ea20..f42c85eb33 100644 --- a/cpp/src/qmf/ValueImpl.cpp +++ b/cpp/src/qmf/ValueImpl.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "ValueImpl.h" +#include "qmf/ValueImpl.h" #include <qpid/framing/FieldTable.h> using namespace std; diff --git a/cpp/src/qpid/Address.cpp b/cpp/src/qpid/Address.cpp index ac8c7f30b1..c3f6829fd3 100644 --- a/cpp/src/qpid/Address.cpp +++ b/cpp/src/qpid/Address.cpp @@ -16,7 +16,7 @@ * */ -#include "Address.h" +#include "qpid/Address.h" #include <ostream> diff --git a/cpp/src/qpid/DataDir.cpp b/cpp/src/qpid/DataDir.cpp index 4d61d22219..0ee30709af 100644 --- a/cpp/src/qpid/DataDir.cpp +++ b/cpp/src/qpid/DataDir.cpp @@ -18,8 +18,8 @@ * */ -#include "Exception.h" -#include "DataDir.h" +#include "qpid/Exception.h" +#include "qpid/DataDir.h" #include "qpid/log/Statement.h" #include "qpid/sys/FileSysDir.h" diff --git a/cpp/src/qpid/Exception.cpp b/cpp/src/qpid/Exception.cpp index 05d1a26f57..16a3a13d17 100644 --- a/cpp/src/qpid/Exception.cpp +++ b/cpp/src/qpid/Exception.cpp @@ -20,7 +20,7 @@ */ #include "qpid/log/Statement.h" -#include "Exception.h" +#include "qpid/Exception.h" #include <typeinfo> #include <assert.h> #include <string.h> diff --git a/cpp/src/qpid/InlineVector.h b/cpp/src/qpid/InlineVector.h index 551b9912e7..c23841decd 100644 --- a/cpp/src/qpid/InlineVector.h +++ b/cpp/src/qpid/InlineVector.h @@ -22,7 +22,7 @@ * */ -#include "InlineAllocator.h" +#include "qpid/InlineAllocator.h" #include <vector> namespace qpid { diff --git a/cpp/src/qpid/Modules.cpp b/cpp/src/qpid/Modules.cpp index 1b802f0019..78afbb23ad 100644 --- a/cpp/src/qpid/Modules.cpp +++ b/cpp/src/qpid/Modules.cpp @@ -19,8 +19,8 @@ * */ -#include "Modules.h" -#include "Exception.h" +#include "qpid/Modules.h" +#include "qpid/Exception.h" #include "qpid/log/Statement.h" #include "qpid/sys/Shlib.h" diff --git a/cpp/src/qpid/Modules.h b/cpp/src/qpid/Modules.h index ce06dd0ef6..159dd156c1 100644 --- a/cpp/src/qpid/Modules.h +++ b/cpp/src/qpid/Modules.h @@ -22,7 +22,7 @@ * */ -#include "Options.h" +#include "qpid/Options.h" #include <string> #include <vector> #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/Options.cpp b/cpp/src/qpid/Options.cpp index cc48323266..499fb71bc3 100644 --- a/cpp/src/qpid/Options.cpp +++ b/cpp/src/qpid/Options.cpp @@ -16,7 +16,7 @@ * */ -#include "Options.h" +#include "qpid/Options.h" #include "qpid/Exception.h" #include <boost/bind.hpp> diff --git a/cpp/src/qpid/Plugin.cpp b/cpp/src/qpid/Plugin.cpp index e4b76db28a..a37479a020 100644 --- a/cpp/src/qpid/Plugin.cpp +++ b/cpp/src/qpid/Plugin.cpp @@ -18,7 +18,7 @@ * */ -#include "Plugin.h" +#include "qpid/Plugin.h" #include "qpid/Options.h" #include <boost/bind.hpp> #include <algorithm> diff --git a/cpp/src/qpid/RefCountedBuffer.cpp b/cpp/src/qpid/RefCountedBuffer.cpp index 57ef48ac42..9b8f1ebd5e 100644 --- a/cpp/src/qpid/RefCountedBuffer.cpp +++ b/cpp/src/qpid/RefCountedBuffer.cpp @@ -19,7 +19,7 @@ * */ -#include "RefCountedBuffer.h" +#include "qpid/RefCountedBuffer.h" #include <new> namespace qpid { diff --git a/cpp/src/qpid/SessionId.cpp b/cpp/src/qpid/SessionId.cpp index 098998015f..c7e83f83d7 100644 --- a/cpp/src/qpid/SessionId.cpp +++ b/cpp/src/qpid/SessionId.cpp @@ -19,7 +19,7 @@ * */ -#include "SessionId.h" +#include "qpid/SessionId.h" #include <sstream> namespace qpid { diff --git a/cpp/src/qpid/SessionState.cpp b/cpp/src/qpid/SessionState.cpp index 3e844fb24b..4f370c6765 100644 --- a/cpp/src/qpid/SessionState.cpp +++ b/cpp/src/qpid/SessionState.cpp @@ -19,7 +19,7 @@ * */ -#include "SessionState.h" +#include "qpid/SessionState.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/framing/AMQMethodBody.h" #include "qpid/framing/enum.h" diff --git a/cpp/src/qpid/StringUtils.cpp b/cpp/src/qpid/StringUtils.cpp index 17eb141e12..c436441c56 100644 --- a/cpp/src/qpid/StringUtils.cpp +++ b/cpp/src/qpid/StringUtils.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "StringUtils.h" +#include "qpid/StringUtils.h" namespace qpid { diff --git a/cpp/src/qpid/agent/ManagementAgent.h b/cpp/src/qpid/agent/ManagementAgent.h index 1ab888c4ef..4dc4f0e895 100644 --- a/cpp/src/qpid/agent/ManagementAgent.h +++ b/cpp/src/qpid/agent/ManagementAgent.h @@ -20,7 +20,7 @@ // under the License. // -#include "QmfAgentImportExport.h" +#include "qpid/agent/QmfAgentImportExport.h" #include "qpid/management/ManagementObject.h" #include "qpid/management/ManagementEvent.h" #include "qpid/management/Manageable.h" diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp index c5e2682cba..7f69c73ef7 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp +++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp @@ -22,7 +22,7 @@ #include "qpid/management/ManagementObject.h" #include "qpid/log/Statement.h" #include "qpid/sys/PipeHandle.h" -#include "ManagementAgentImpl.h" +#include "qpid/agent/ManagementAgentImpl.h" #include <list> #include <string.h> #include <stdlib.h> diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.h b/cpp/src/qpid/agent/ManagementAgentImpl.h index cc668b4995..f9cad9ebf5 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.h +++ b/cpp/src/qpid/agent/ManagementAgentImpl.h @@ -20,7 +20,7 @@ // under the License. // -#include "ManagementAgent.h" +#include "qpid/agent/ManagementAgent.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionSettings.h" #include "qpid/client/SubscriptionManager.h" diff --git a/cpp/src/qpid/amqp_0_10/Array.cpp b/cpp/src/qpid/amqp_0_10/Array.cpp index 380e0f1f36..2ee47546f2 100644 --- a/cpp/src/qpid/amqp_0_10/Array.cpp +++ b/cpp/src/qpid/amqp_0_10/Array.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Array.h" +#include "qpid/amqp_0_10/Array.h" namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/Codec.h b/cpp/src/qpid/amqp_0_10/Codec.h index 5cad5cf4ed..fd006a348e 100644 --- a/cpp/src/qpid/amqp_0_10/Codec.h +++ b/cpp/src/qpid/amqp_0_10/Codec.h @@ -22,7 +22,7 @@ * */ -#include "built_in_types.h" +#include "qpid/amqp_0_10/built_in_types.h" #include "qpid/Serializer.h" #include <boost/type_traits/is_integral.hpp> #include <boost/type_traits/is_float.hpp> diff --git a/cpp/src/qpid/amqp_0_10/Command.h b/cpp/src/qpid/amqp_0_10/Command.h index 0fe023e520..b1d3607a84 100644 --- a/cpp/src/qpid/amqp_0_10/Command.h +++ b/cpp/src/qpid/amqp_0_10/Command.h @@ -22,7 +22,7 @@ * */ -#include "Control.h" +#include "qpid/amqp_0_10/Control.h" #include "qpid/amqp_0_10/structs.h" namespace qpid { diff --git a/cpp/src/qpid/amqp_0_10/Connection.cpp b/cpp/src/qpid/amqp_0_10/Connection.cpp index 34134150da..c1de5e2dec 100644 --- a/cpp/src/qpid/amqp_0_10/Connection.cpp +++ b/cpp/src/qpid/amqp_0_10/Connection.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Connection.h" +#include "qpid/amqp_0_10/Connection.h" #include "qpid/log/Statement.h" #include "qpid/amqp_0_10/exceptions.h" #include "qpid/framing/AMQFrame.h" diff --git a/cpp/src/qpid/amqp_0_10/Control.h b/cpp/src/qpid/amqp_0_10/Control.h index 226f6f92a6..ce188ae6d8 100644 --- a/cpp/src/qpid/amqp_0_10/Control.h +++ b/cpp/src/qpid/amqp_0_10/Control.h @@ -22,7 +22,7 @@ * */ -#include "Struct.h" +#include "qpid/amqp_0_10/Struct.h" namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/FrameHeader.cpp b/cpp/src/qpid/amqp_0_10/FrameHeader.cpp index f1a59b9e27..371e3c1bcb 100644 --- a/cpp/src/qpid/amqp_0_10/FrameHeader.cpp +++ b/cpp/src/qpid/amqp_0_10/FrameHeader.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "FrameHeader.h" +#include "qpid/amqp_0_10/FrameHeader.h" #include <ios> #include <iomanip> #include <ostream> diff --git a/cpp/src/qpid/amqp_0_10/Header.cpp b/cpp/src/qpid/amqp_0_10/Header.cpp index 669c960e7f..d83814e969 100644 --- a/cpp/src/qpid/amqp_0_10/Header.cpp +++ b/cpp/src/qpid/amqp_0_10/Header.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Header.h" +#include "qpid/amqp_0_10/Header.h" namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/Holder.h b/cpp/src/qpid/amqp_0_10/Holder.h index 8712db6c86..605d2e0ed5 100644 --- a/cpp/src/qpid/amqp_0_10/Holder.h +++ b/cpp/src/qpid/amqp_0_10/Holder.h @@ -22,7 +22,7 @@ * */ #include "qpid/framing/Blob.h" -#include "apply.h" +#include "qpid/amqp_0_10/apply.h" namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/Map.cpp b/cpp/src/qpid/amqp_0_10/Map.cpp index b517b8baba..af3b302d25 100644 --- a/cpp/src/qpid/amqp_0_10/Map.cpp +++ b/cpp/src/qpid/amqp_0_10/Map.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Map.h" +#include "qpid/amqp_0_10/Map.h" #include "qpid/amqp_0_10/Struct32.h" #include "qpid/amqp_0_10/Array.h" #include <ostream> diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp b/cpp/src/qpid/amqp_0_10/SessionHandler.cpp index f8ae81e5d1..c33573b178 100644 --- a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp +++ b/cpp/src/qpid/amqp_0_10/SessionHandler.cpp @@ -19,7 +19,7 @@ */ -#include "SessionHandler.h" +#include "qpid/amqp_0_10/SessionHandler.h" #include "qpid/SessionState.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/framing/AllInvoker.h" diff --git a/cpp/src/qpid/amqp_0_10/Struct.h b/cpp/src/qpid/amqp_0_10/Struct.h index c0cea09c60..29ece84f6e 100644 --- a/cpp/src/qpid/amqp_0_10/Struct.h +++ b/cpp/src/qpid/amqp_0_10/Struct.h @@ -22,7 +22,7 @@ * */ -#include "built_in_types.h" +#include "qpid/amqp_0_10/built_in_types.h" #include <iosfwd> namespace qpid { diff --git a/cpp/src/qpid/amqp_0_10/Struct32.cpp b/cpp/src/qpid/amqp_0_10/Struct32.cpp index 541f02bcc4..2d38c09c21 100644 --- a/cpp/src/qpid/amqp_0_10/Struct32.cpp +++ b/cpp/src/qpid/amqp_0_10/Struct32.cpp @@ -18,7 +18,7 @@ * */ -#include "Struct32.h" +#include "qpid/amqp_0_10/Struct32.h" namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/Unit.cpp b/cpp/src/qpid/amqp_0_10/Unit.cpp index 75ea1c1b30..381de76dcc 100644 --- a/cpp/src/qpid/amqp_0_10/Unit.cpp +++ b/cpp/src/qpid/amqp_0_10/Unit.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "Unit.h" -#include "Codec.h" +#include "qpid/amqp_0_10/Unit.h" +#include "qpid/amqp_0_10/Codec.h" namespace qpid { namespace amqp_0_10 { diff --git a/cpp/src/qpid/amqp_0_10/UnknownType.cpp b/cpp/src/qpid/amqp_0_10/UnknownType.cpp index 844891d732..cd45dd76db 100644 --- a/cpp/src/qpid/amqp_0_10/UnknownType.cpp +++ b/cpp/src/qpid/amqp_0_10/UnknownType.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "UnknownType.h" +#include "qpid/amqp_0_10/UnknownType.h" #include <boost/range/iterator_range.hpp> #include <ostream> diff --git a/cpp/src/qpid/amqp_0_10/built_in_types.h b/cpp/src/qpid/amqp_0_10/built_in_types.h index 196e02a302..e95d1cf3e9 100644 --- a/cpp/src/qpid/amqp_0_10/built_in_types.h +++ b/cpp/src/qpid/amqp_0_10/built_in_types.h @@ -25,8 +25,8 @@ #include "qpid/framing/Uuid.h" #include "qpid/sys/IntegerTypes.h" #include "qpid/sys/Time.h" -#include "Decimal.h" -#include "SerializableString.h" +#include "qpid/amqp_0_10/Decimal.h" +#include "qpid/amqp_0_10/SerializableString.h" #include <boost/array.hpp> #include <boost/range/iterator_range.hpp> #include <string> diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp index d5a36d2bc8..79e311d032 100644 --- a/cpp/src/qpid/broker/Bridge.cpp +++ b/cpp/src/qpid/broker/Bridge.cpp @@ -18,12 +18,12 @@ * under the License. * */ -#include "Bridge.h" -#include "ConnectionState.h" -#include "Connection.h" -#include "Link.h" -#include "LinkRegistry.h" -#include "SessionState.h" +#include "qpid/broker/Bridge.h" +#include "qpid/broker/ConnectionState.h" +#include "qpid/broker/Connection.h" +#include "qpid/broker/Link.h" +#include "qpid/broker/LinkRegistry.h" +#include "qpid/broker/SessionState.h" #include "qpid/management/ManagementAgent.h" #include "qpid/framing/Uuid.h" diff --git a/cpp/src/qpid/broker/Bridge.h b/cpp/src/qpid/broker/Bridge.h index 9578c60f4a..7dae5c37a1 100644 --- a/cpp/src/qpid/broker/Bridge.h +++ b/cpp/src/qpid/broker/Bridge.h @@ -21,14 +21,14 @@ #ifndef _Bridge_ #define _Bridge_ -#include "PersistableConfig.h" +#include "qpid/broker/PersistableConfig.h" #include "qpid/framing/AMQP_ServerProxy.h" #include "qpid/framing/ChannelHandler.h" #include "qpid/framing/Buffer.h" #include "qpid/framing/FrameHandler.h" #include "qpid/framing/FieldTable.h" #include "qpid/management/Manageable.h" -#include "Exchange.h" +#include "qpid/broker/Exchange.h" #include "qmf/org/apache/qpid/broker/ArgsLinkBridge.h" #include "qmf/org/apache/qpid/broker/Bridge.h" diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 4fcb8b6451..a937a6b9b2 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -19,18 +19,18 @@ * */ -#include "Broker.h" -#include "DirectExchange.h" -#include "FanOutExchange.h" -#include "HeadersExchange.h" -#include "MessageStoreModule.h" -#include "NullMessageStore.h" -#include "RecoveryManagerImpl.h" -#include "SaslAuthenticator.h" -#include "SecureConnectionFactory.h" -#include "TopicExchange.h" -#include "Link.h" -#include "ExpiryPolicy.h" +#include "qpid/broker/Broker.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/broker/FanOutExchange.h" +#include "qpid/broker/HeadersExchange.h" +#include "qpid/broker/MessageStoreModule.h" +#include "qpid/broker/NullMessageStore.h" +#include "qpid/broker/RecoveryManagerImpl.h" +#include "qpid/broker/SaslAuthenticator.h" +#include "qpid/broker/SecureConnectionFactory.h" +#include "qpid/broker/TopicExchange.h" +#include "qpid/broker/Link.h" +#include "qpid/broker/ExpiryPolicy.h" #include "qmf/org/apache/qpid/broker/Package.h" #include "qmf/org/apache/qpid/broker/ArgsBrokerEcho.h" diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h index 0a12b3f7d3..ac8f835398 100644 --- a/cpp/src/qpid/broker/Broker.h +++ b/cpp/src/qpid/broker/Broker.h @@ -22,22 +22,22 @@ * */ -#include "BrokerImportExport.h" -#include "ConnectionFactory.h" -#include "ConnectionToken.h" -#include "DirectExchange.h" -#include "DtxManager.h" -#include "ExchangeRegistry.h" -#include "MessageStore.h" -#include "QueueRegistry.h" -#include "LinkRegistry.h" -#include "SessionManager.h" -#include "QueueCleaner.h" -#include "QueueEvents.h" -#include "Vhost.h" -#include "System.h" -#include "Timer.h" -#include "ExpiryPolicy.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/ConnectionFactory.h" +#include "qpid/broker/ConnectionToken.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/broker/DtxManager.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/broker/LinkRegistry.h" +#include "qpid/broker/SessionManager.h" +#include "qpid/broker/QueueCleaner.h" +#include "qpid/broker/QueueEvents.h" +#include "qpid/broker/Vhost.h" +#include "qpid/broker/System.h" +#include "qpid/broker/Timer.h" +#include "qpid/broker/ExpiryPolicy.h" #include "qpid/management/Manageable.h" #include "qpid/management/ManagementAgent.h" #include "qmf/org/apache/qpid/broker/Broker.h" @@ -50,7 +50,7 @@ #include "qpid/framing/ProtocolInitiation.h" #include "qpid/sys/Runnable.h" #include "qpid/RefCounted.h" -#include "AclModule.h" +#include "qpid/broker/AclModule.h" #include <boost/intrusive_ptr.hpp> #include <string> diff --git a/cpp/src/qpid/broker/BrokerSingleton.cpp b/cpp/src/qpid/broker/BrokerSingleton.cpp index 5ba8c9d1e1..9dfdd1f6b8 100644 --- a/cpp/src/qpid/broker/BrokerSingleton.cpp +++ b/cpp/src/qpid/broker/BrokerSingleton.cpp @@ -16,7 +16,7 @@ * */ -#include "BrokerSingleton.h" +#include "qpid/broker/BrokerSingleton.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/BrokerSingleton.h b/cpp/src/qpid/broker/BrokerSingleton.h index 3a842ee05a..44a9b8b77c 100644 --- a/cpp/src/qpid/broker/BrokerSingleton.h +++ b/cpp/src/qpid/broker/BrokerSingleton.h @@ -19,8 +19,8 @@ * */ -#include "Broker.h" -#include "BrokerImportExport.h" +#include "qpid/broker/Broker.h" +#include "qpid/broker/BrokerImportExport.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index a54bcc6db9..91c95289ac 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -18,10 +18,10 @@ * under the License. * */ -#include "Connection.h" -#include "SessionState.h" -#include "Bridge.h" -#include "Broker.h" +#include "qpid/broker/Connection.h" +#include "qpid/broker/SessionState.h" +#include "qpid/broker/Bridge.h" +#include "qpid/broker/Broker.h" #include "qpid/log/Statement.h" #include "qpid/ptr_map.h" diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h index 17bc8f0970..731d36d83b 100644 --- a/cpp/src/qpid/broker/Connection.h +++ b/cpp/src/qpid/broker/Connection.h @@ -29,9 +29,9 @@ #include <boost/ptr_container/ptr_map.hpp> -#include "ConnectionHandler.h" -#include "ConnectionState.h" -#include "SessionHandler.h" +#include "qpid/broker/ConnectionHandler.h" +#include "qpid/broker/ConnectionState.h" +#include "qpid/broker/SessionHandler.h" #include "qmf/org/apache/qpid/broker/Connection.h" #include "qpid/Exception.h" #include "qpid/RefCounted.h" diff --git a/cpp/src/qpid/broker/ConnectionFactory.cpp b/cpp/src/qpid/broker/ConnectionFactory.cpp index e6d8c49055..93108b35f7 100644 --- a/cpp/src/qpid/broker/ConnectionFactory.cpp +++ b/cpp/src/qpid/broker/ConnectionFactory.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "ConnectionFactory.h" +#include "qpid/broker/ConnectionFactory.h" #include "qpid/framing/ProtocolVersion.h" #include "qpid/amqp_0_10/Connection.h" #include "qpid/broker/Connection.h" diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/cpp/src/qpid/broker/ConnectionHandler.cpp index 6de374955b..50a5aff2c9 100644 --- a/cpp/src/qpid/broker/ConnectionHandler.cpp +++ b/cpp/src/qpid/broker/ConnectionHandler.cpp @@ -20,15 +20,15 @@ * */ -#include "ConnectionHandler.h" -#include "Connection.h" -#include "SecureConnection.h" +#include "qpid/broker/ConnectionHandler.h" +#include "qpid/broker/Connection.h" +#include "qpid/broker/SecureConnection.h" #include "qpid/Url.h" #include "qpid/framing/AllInvoker.h" #include "qpid/framing/enum.h" #include "qpid/log/Statement.h" #include "qpid/sys/SecurityLayer.h" -#include "AclModule.h" +#include "qpid/broker/AclModule.h" #include "qmf/org/apache/qpid/broker/EventClientConnectFail.h" using namespace qpid; diff --git a/cpp/src/qpid/broker/ConnectionHandler.h b/cpp/src/qpid/broker/ConnectionHandler.h index ac4816dafa..d74f65da36 100644 --- a/cpp/src/qpid/broker/ConnectionHandler.h +++ b/cpp/src/qpid/broker/ConnectionHandler.h @@ -22,7 +22,7 @@ #define _ConnectionAdapter_ #include <memory> -#include "SaslAuthenticator.h" +#include "qpid/broker/SaslAuthenticator.h" #include "qpid/framing/amqp_types.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/AMQP_AllOperations.h" @@ -32,7 +32,7 @@ #include "qpid/framing/ProtocolInitiation.h" #include "qpid/framing/ProtocolVersion.h" #include "qpid/Exception.h" -#include "AclModule.h" +#include "qpid/broker/AclModule.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/ConnectionState.h b/cpp/src/qpid/broker/ConnectionState.h index b712af11f5..77ac5a59b0 100644 --- a/cpp/src/qpid/broker/ConnectionState.h +++ b/cpp/src/qpid/broker/ConnectionState.h @@ -28,7 +28,7 @@ #include "qpid/framing/ProtocolVersion.h" #include "qpid/management/Manageable.h" #include "qpid/Url.h" -#include "Broker.h" +#include "qpid/broker/Broker.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/ConnectionToken.h b/cpp/src/qpid/broker/ConnectionToken.h index 0e3b301897..9b40383c80 100644 --- a/cpp/src/qpid/broker/ConnectionToken.h +++ b/cpp/src/qpid/broker/ConnectionToken.h @@ -21,7 +21,7 @@ #ifndef _ConnectionToken_ #define _ConnectionToken_ -#include "OwnershipToken.h" +#include "qpid/broker/OwnershipToken.h" namespace qpid { namespace broker { /** diff --git a/cpp/src/qpid/broker/Consumer.h b/cpp/src/qpid/broker/Consumer.h index 5de00668b3..b96443fa7c 100644 --- a/cpp/src/qpid/broker/Consumer.h +++ b/cpp/src/qpid/broker/Consumer.h @@ -21,9 +21,9 @@ #ifndef _Consumer_ #define _Consumer_ -#include "Message.h" -#include "QueuedMessage.h" -#include "OwnershipToken.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/QueuedMessage.h" +#include "qpid/broker/OwnershipToken.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/Daemon.cpp b/cpp/src/qpid/broker/Daemon.cpp index 88eb8fc1cd..1f79251d2f 100644 --- a/cpp/src/qpid/broker/Daemon.cpp +++ b/cpp/src/qpid/broker/Daemon.cpp @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "Daemon.h" +#include "qpid/broker/Daemon.h" #include "qpid/log/Statement.h" #include "qpid/Exception.h" #include "qpid/sys/LockFile.h" diff --git a/cpp/src/qpid/broker/Deliverable.h b/cpp/src/qpid/broker/Deliverable.h index e0ceeb2408..433469a212 100644 --- a/cpp/src/qpid/broker/Deliverable.h +++ b/cpp/src/qpid/broker/Deliverable.h @@ -21,8 +21,8 @@ #ifndef _Deliverable_ #define _Deliverable_ -#include "Queue.h" -#include "Message.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/Message.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/DeliverableMessage.cpp b/cpp/src/qpid/broker/DeliverableMessage.cpp index 5fff54b329..658e6bf48f 100644 --- a/cpp/src/qpid/broker/DeliverableMessage.cpp +++ b/cpp/src/qpid/broker/DeliverableMessage.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "DeliverableMessage.h" +#include "qpid/broker/DeliverableMessage.h" using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/cpp/src/qpid/broker/DeliverableMessage.h index ad944c746b..08abce35ef 100644 --- a/cpp/src/qpid/broker/DeliverableMessage.h +++ b/cpp/src/qpid/broker/DeliverableMessage.h @@ -21,10 +21,10 @@ #ifndef _DeliverableMessage_ #define _DeliverableMessage_ -#include "BrokerImportExport.h" -#include "Deliverable.h" -#include "Queue.h" -#include "Message.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Deliverable.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/Message.h" #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/DeliveryAdapter.h b/cpp/src/qpid/broker/DeliveryAdapter.h index d661b7caa5..b0bec60890 100644 --- a/cpp/src/qpid/broker/DeliveryAdapter.h +++ b/cpp/src/qpid/broker/DeliveryAdapter.h @@ -21,8 +21,8 @@ #ifndef _DeliveryAdapter_ #define _DeliveryAdapter_ -#include "DeliveryId.h" -#include "Message.h" +#include "qpid/broker/DeliveryId.h" +#include "qpid/broker/Message.h" #include "qpid/framing/amqp_types.h" namespace qpid { diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp index 4db32bd96d..0cfa2391fd 100644 --- a/cpp/src/qpid/broker/DeliveryRecord.cpp +++ b/cpp/src/qpid/broker/DeliveryRecord.cpp @@ -18,10 +18,10 @@ * under the License. * */ -#include "DeliveryRecord.h" -#include "DeliverableMessage.h" -#include "SemanticState.h" -#include "Exchange.h" +#include "qpid/broker/DeliveryRecord.h" +#include "qpid/broker/DeliverableMessage.h" +#include "qpid/broker/SemanticState.h" +#include "qpid/broker/Exchange.h" #include "qpid/log/Statement.h" #include "qpid/framing/FrameHandler.h" #include "qpid/framing/MessageTransferBody.h" diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/cpp/src/qpid/broker/DeliveryRecord.h index 970d04ed49..5f802766b6 100644 --- a/cpp/src/qpid/broker/DeliveryRecord.h +++ b/cpp/src/qpid/broker/DeliveryRecord.h @@ -27,11 +27,11 @@ #include <vector> #include <ostream> #include "qpid/framing/SequenceSet.h" -#include "BrokerImportExport.h" -#include "Queue.h" -#include "QueuedMessage.h" -#include "DeliveryId.h" -#include "Message.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/QueuedMessage.h" +#include "qpid/broker/DeliveryId.h" +#include "qpid/broker/Message.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp index deb9699c96..454b497f11 100644 --- a/cpp/src/qpid/broker/DirectExchange.cpp +++ b/cpp/src/qpid/broker/DirectExchange.cpp @@ -19,7 +19,7 @@ * */ #include "qpid/log/Statement.h" -#include "DirectExchange.h" +#include "qpid/broker/DirectExchange.h" #include <iostream> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/DirectExchange.h b/cpp/src/qpid/broker/DirectExchange.h index 9081c319c0..9a73f3bc41 100644 --- a/cpp/src/qpid/broker/DirectExchange.h +++ b/cpp/src/qpid/broker/DirectExchange.h @@ -23,12 +23,12 @@ #include <map> #include <vector> -#include "BrokerImportExport.h" -#include "Exchange.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Exchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/CopyOnWriteArray.h" #include "qpid/sys/Mutex.h" -#include "Queue.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/DtxAck.cpp b/cpp/src/qpid/broker/DtxAck.cpp index c32c699421..b189ef4cdb 100644 --- a/cpp/src/qpid/broker/DtxAck.cpp +++ b/cpp/src/qpid/broker/DtxAck.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "DtxAck.h" +#include "qpid/broker/DtxAck.h" #include "qpid/log/Statement.h" using std::bind1st; diff --git a/cpp/src/qpid/broker/DtxAck.h b/cpp/src/qpid/broker/DtxAck.h index 2b7b2f0944..166147e58d 100644 --- a/cpp/src/qpid/broker/DtxAck.h +++ b/cpp/src/qpid/broker/DtxAck.h @@ -25,8 +25,8 @@ #include <functional> #include <list> #include "qpid/framing/SequenceSet.h" -#include "DeliveryRecord.h" -#include "TxOp.h" +#include "qpid/broker/DeliveryRecord.h" +#include "qpid/broker/TxOp.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/DtxBuffer.cpp b/cpp/src/qpid/broker/DtxBuffer.cpp index 29a07ea6d9..f1b8169cf7 100644 --- a/cpp/src/qpid/broker/DtxBuffer.cpp +++ b/cpp/src/qpid/broker/DtxBuffer.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "DtxBuffer.h" +#include "qpid/broker/DtxBuffer.h" using namespace qpid::broker; using qpid::sys::Mutex; diff --git a/cpp/src/qpid/broker/DtxBuffer.h b/cpp/src/qpid/broker/DtxBuffer.h index ce37d09b7a..1511cb032f 100644 --- a/cpp/src/qpid/broker/DtxBuffer.h +++ b/cpp/src/qpid/broker/DtxBuffer.h @@ -21,8 +21,8 @@ #ifndef _DtxBuffer_ #define _DtxBuffer_ -#include "BrokerImportExport.h" -#include "TxBuffer.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/TxBuffer.h" #include "qpid/sys/Mutex.h" namespace qpid { diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp index 11e16ec837..9eb077716d 100644 --- a/cpp/src/qpid/broker/DtxManager.cpp +++ b/cpp/src/qpid/broker/DtxManager.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "DtxManager.h" -#include "DtxTimeout.h" +#include "qpid/broker/DtxManager.h" +#include "qpid/broker/DtxTimeout.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/log/Statement.h" #include "qpid/ptr_map.h" diff --git a/cpp/src/qpid/broker/DtxManager.h b/cpp/src/qpid/broker/DtxManager.h index a61e8610f0..4b4fde3b39 100644 --- a/cpp/src/qpid/broker/DtxManager.h +++ b/cpp/src/qpid/broker/DtxManager.h @@ -22,10 +22,10 @@ #define _DtxManager_ #include <boost/ptr_container/ptr_map.hpp> -#include "DtxBuffer.h" -#include "DtxWorkRecord.h" -#include "Timer.h" -#include "TransactionalStore.h" +#include "qpid/broker/DtxBuffer.h" +#include "qpid/broker/DtxWorkRecord.h" +#include "qpid/broker/Timer.h" +#include "qpid/broker/TransactionalStore.h" #include "qpid/framing/amqp_types.h" #include "qpid/sys/Mutex.h" diff --git a/cpp/src/qpid/broker/DtxTimeout.cpp b/cpp/src/qpid/broker/DtxTimeout.cpp index 8e0a7741c4..f5238d0909 100644 --- a/cpp/src/qpid/broker/DtxTimeout.cpp +++ b/cpp/src/qpid/broker/DtxTimeout.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "DtxTimeout.h" -#include "DtxManager.h" +#include "qpid/broker/DtxTimeout.h" +#include "qpid/broker/DtxManager.h" #include "qpid/sys/Time.h" using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/DtxTimeout.h b/cpp/src/qpid/broker/DtxTimeout.h index 6e949eab0d..3c468b3373 100644 --- a/cpp/src/qpid/broker/DtxTimeout.h +++ b/cpp/src/qpid/broker/DtxTimeout.h @@ -22,7 +22,7 @@ #define _DtxTimeout_ #include "qpid/Exception.h" -#include "Timer.h" +#include "qpid/broker/Timer.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/DtxWorkRecord.cpp b/cpp/src/qpid/broker/DtxWorkRecord.cpp index 82e63211fa..9f33e698db 100644 --- a/cpp/src/qpid/broker/DtxWorkRecord.cpp +++ b/cpp/src/qpid/broker/DtxWorkRecord.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "DtxWorkRecord.h" +#include "qpid/broker/DtxWorkRecord.h" #include "qpid/framing/reply_exceptions.h" #include <boost/format.hpp> #include <boost/mem_fn.hpp> diff --git a/cpp/src/qpid/broker/DtxWorkRecord.h b/cpp/src/qpid/broker/DtxWorkRecord.h index 21fc759d66..aec2d2aed4 100644 --- a/cpp/src/qpid/broker/DtxWorkRecord.h +++ b/cpp/src/qpid/broker/DtxWorkRecord.h @@ -21,10 +21,10 @@ #ifndef _DtxWorkRecord_ #define _DtxWorkRecord_ -#include "BrokerImportExport.h" -#include "DtxBuffer.h" -#include "DtxTimeout.h" -#include "TransactionalStore.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/DtxBuffer.h" +#include "qpid/broker/DtxTimeout.h" +#include "qpid/broker/TransactionalStore.h" #include "qpid/framing/amqp_types.h" #include "qpid/sys/Mutex.h" diff --git a/cpp/src/qpid/broker/Exchange.cpp b/cpp/src/qpid/broker/Exchange.cpp index 6ce381d199..17fc0e23ca 100644 --- a/cpp/src/qpid/broker/Exchange.cpp +++ b/cpp/src/qpid/broker/Exchange.cpp @@ -19,13 +19,13 @@ * */ -#include "Exchange.h" -#include "ExchangeRegistry.h" -#include "Broker.h" +#include "qpid/broker/Exchange.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/Broker.h" #include "qpid/management/ManagementAgent.h" #include "qpid/log/Statement.h" #include "qpid/framing/MessageProperties.h" -#include "DeliverableMessage.h" +#include "qpid/broker/DeliverableMessage.h" using namespace qpid::broker; using namespace qpid::framing; diff --git a/cpp/src/qpid/broker/Exchange.h b/cpp/src/qpid/broker/Exchange.h index e33c0c6bbc..ca8525d55e 100644 --- a/cpp/src/qpid/broker/Exchange.h +++ b/cpp/src/qpid/broker/Exchange.h @@ -23,11 +23,11 @@ */ #include <boost/shared_ptr.hpp> -#include "BrokerImportExport.h" -#include "Deliverable.h" -#include "Queue.h" -#include "MessageStore.h" -#include "PersistableExchange.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Deliverable.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/PersistableExchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Mutex.h" #include "qpid/management/Manageable.h" diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp index 8aa1008dbb..951cdbd395 100644 --- a/cpp/src/qpid/broker/ExchangeRegistry.cpp +++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp @@ -19,11 +19,11 @@ * */ -#include "ExchangeRegistry.h" -#include "DirectExchange.h" -#include "FanOutExchange.h" -#include "HeadersExchange.h" -#include "TopicExchange.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/DirectExchange.h" +#include "qpid/broker/FanOutExchange.h" +#include "qpid/broker/HeadersExchange.h" +#include "qpid/broker/TopicExchange.h" #include "qpid/management/ManagementExchange.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h index 3dc8eef187..c20a53e598 100644 --- a/cpp/src/qpid/broker/ExchangeRegistry.h +++ b/cpp/src/qpid/broker/ExchangeRegistry.h @@ -22,9 +22,9 @@ * */ -#include "BrokerImportExport.h" -#include "Exchange.h" -#include "MessageStore.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Exchange.h" +#include "qpid/broker/MessageStore.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Monitor.h" #include "qpid/management/Manageable.h" diff --git a/cpp/src/qpid/broker/ExpiryPolicy.cpp b/cpp/src/qpid/broker/ExpiryPolicy.cpp index ffe0cc437b..64a12d918a 100644 --- a/cpp/src/qpid/broker/ExpiryPolicy.cpp +++ b/cpp/src/qpid/broker/ExpiryPolicy.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "ExpiryPolicy.h" -#include "Message.h" +#include "qpid/broker/ExpiryPolicy.h" +#include "qpid/broker/Message.h" #include "qpid/sys/Time.h" namespace qpid { diff --git a/cpp/src/qpid/broker/ExpiryPolicy.h b/cpp/src/qpid/broker/ExpiryPolicy.h index eeb3ffda21..40e793bf2c 100644 --- a/cpp/src/qpid/broker/ExpiryPolicy.h +++ b/cpp/src/qpid/broker/ExpiryPolicy.h @@ -23,7 +23,7 @@ */ #include "qpid/RefCounted.h" -#include "BrokerImportExport.h" +#include "qpid/broker/BrokerImportExport.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/cpp/src/qpid/broker/FanOutExchange.cpp index dc3bda4262..e9007ba682 100644 --- a/cpp/src/qpid/broker/FanOutExchange.cpp +++ b/cpp/src/qpid/broker/FanOutExchange.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "FanOutExchange.h" +#include "qpid/broker/FanOutExchange.h" #include <algorithm> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/cpp/src/qpid/broker/FanOutExchange.h index 32da9fe5b5..7bcf6367cf 100644 --- a/cpp/src/qpid/broker/FanOutExchange.h +++ b/cpp/src/qpid/broker/FanOutExchange.h @@ -23,11 +23,11 @@ #include <map> #include <vector> -#include "BrokerImportExport.h" -#include "Exchange.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Exchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/CopyOnWriteArray.h" -#include "Queue.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/HandlerImpl.h b/cpp/src/qpid/broker/HandlerImpl.h index 4c51e2a826..aae636e818 100644 --- a/cpp/src/qpid/broker/HandlerImpl.h +++ b/cpp/src/qpid/broker/HandlerImpl.h @@ -19,9 +19,9 @@ * */ -#include "SemanticState.h" -#include "SessionContext.h" -#include "ConnectionState.h" +#include "qpid/broker/SemanticState.h" +#include "qpid/broker/SessionContext.h" +#include "qpid/broker/ConnectionState.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/cpp/src/qpid/broker/HeadersExchange.cpp index 4b1176d560..c628c44909 100644 --- a/cpp/src/qpid/broker/HeadersExchange.cpp +++ b/cpp/src/qpid/broker/HeadersExchange.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "HeadersExchange.h" +#include "qpid/broker/HeadersExchange.h" #include "qpid/framing/FieldValue.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/cpp/src/qpid/broker/HeadersExchange.h index 87633c0f0e..6425b44251 100644 --- a/cpp/src/qpid/broker/HeadersExchange.h +++ b/cpp/src/qpid/broker/HeadersExchange.h @@ -22,12 +22,12 @@ #define _HeadersExchange_ #include <vector> -#include "BrokerImportExport.h" -#include "Exchange.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Exchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/CopyOnWriteArray.h" #include "qpid/sys/Mutex.h" -#include "Queue.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/IncompleteMessageList.cpp b/cpp/src/qpid/broker/IncompleteMessageList.cpp index 2077e633ec..4065d92467 100644 --- a/cpp/src/qpid/broker/IncompleteMessageList.cpp +++ b/cpp/src/qpid/broker/IncompleteMessageList.cpp @@ -19,7 +19,7 @@ * */ -#include "IncompleteMessageList.h" +#include "qpid/broker/IncompleteMessageList.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/IncompleteMessageList.h b/cpp/src/qpid/broker/IncompleteMessageList.h index 449194d571..a4debd1233 100644 --- a/cpp/src/qpid/broker/IncompleteMessageList.h +++ b/cpp/src/qpid/broker/IncompleteMessageList.h @@ -21,7 +21,7 @@ #ifndef _IncompleteMessageList_ #define _IncompleteMessageList_ -#include "BrokerImportExport.h" +#include "qpid/broker/BrokerImportExport.h" #include "qpid/sys/Monitor.h" #include "qpid/broker/Message.h" #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp index a2717bfd4c..061e627f47 100644 --- a/cpp/src/qpid/broker/Link.cpp +++ b/cpp/src/qpid/broker/Link.cpp @@ -19,17 +19,17 @@ * */ -#include "Link.h" -#include "LinkRegistry.h" -#include "Broker.h" -#include "Connection.h" +#include "qpid/broker/Link.h" +#include "qpid/broker/LinkRegistry.h" +#include "qpid/broker/Broker.h" +#include "qpid/broker/Connection.h" #include "qmf/org/apache/qpid/broker/EventBrokerLinkUp.h" #include "qmf/org/apache/qpid/broker/EventBrokerLinkDown.h" #include "boost/bind.hpp" #include "qpid/log/Statement.h" #include "qpid/framing/enum.h" #include "qpid/framing/reply_exceptions.h" -#include "AclModule.h" +#include "qpid/broker/AclModule.h" using namespace qpid::broker; using qpid::framing::Buffer; diff --git a/cpp/src/qpid/broker/Link.h b/cpp/src/qpid/broker/Link.h index 0b504651eb..12f03095f0 100644 --- a/cpp/src/qpid/broker/Link.h +++ b/cpp/src/qpid/broker/Link.h @@ -23,10 +23,10 @@ */ #include <boost/shared_ptr.hpp> -#include "MessageStore.h" -#include "PersistableConfig.h" -#include "Bridge.h" -#include "RetryList.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/PersistableConfig.h" +#include "qpid/broker/Bridge.h" +#include "qpid/broker/RetryList.h" #include "qpid/sys/Mutex.h" #include "qpid/framing/FieldTable.h" #include "qpid/management/Manageable.h" diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/cpp/src/qpid/broker/LinkRegistry.cpp index c6e10f0f8c..fce3a88cd1 100644 --- a/cpp/src/qpid/broker/LinkRegistry.cpp +++ b/cpp/src/qpid/broker/LinkRegistry.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "LinkRegistry.h" -#include "Link.h" -#include "Connection.h" +#include "qpid/broker/LinkRegistry.h" +#include "qpid/broker/Link.h" +#include "qpid/broker/Connection.h" #include "qpid/log/Statement.h" #include <iostream> #include <boost/format.hpp> diff --git a/cpp/src/qpid/broker/LinkRegistry.h b/cpp/src/qpid/broker/LinkRegistry.h index 07fff5b979..bfdf0d491b 100644 --- a/cpp/src/qpid/broker/LinkRegistry.h +++ b/cpp/src/qpid/broker/LinkRegistry.h @@ -23,9 +23,9 @@ */ #include <map> -#include "Bridge.h" -#include "MessageStore.h" -#include "Timer.h" +#include "qpid/broker/Bridge.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/Timer.h" #include "qpid/Address.h" #include "qpid/sys/Mutex.h" #include "qpid/management/Manageable.h" diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp index b912cd3a1c..639f04faa2 100644 --- a/cpp/src/qpid/broker/Message.cpp +++ b/cpp/src/qpid/broker/Message.cpp @@ -19,9 +19,9 @@ * */ -#include "Message.h" -#include "ExchangeRegistry.h" -#include "ExpiryPolicy.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/ExpiryPolicy.h" #include "qpid/StringUtils.h" #include "qpid/framing/frame_functors.h" #include "qpid/framing/FieldTable.h" diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h index 2c75d945fa..0024509bc8 100644 --- a/cpp/src/qpid/broker/Message.h +++ b/cpp/src/qpid/broker/Message.h @@ -22,9 +22,9 @@ * */ -#include "BrokerImportExport.h" -#include "PersistableMessage.h" -#include "MessageAdapter.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/PersistableMessage.h" +#include "qpid/broker/MessageAdapter.h" #include "qpid/framing/amqp_types.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/broker/MessageAdapter.cpp b/cpp/src/qpid/broker/MessageAdapter.cpp index 12f01494de..c0c1c4445a 100644 --- a/cpp/src/qpid/broker/MessageAdapter.cpp +++ b/cpp/src/qpid/broker/MessageAdapter.cpp @@ -19,7 +19,7 @@ * */ -#include "MessageAdapter.h" +#include "qpid/broker/MessageAdapter.h" #include "qpid/framing/DeliveryProperties.h" #include "qpid/framing/MessageProperties.h" diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/cpp/src/qpid/broker/MessageBuilder.cpp index bc8c10d4b1..e01fd81074 100644 --- a/cpp/src/qpid/broker/MessageBuilder.cpp +++ b/cpp/src/qpid/broker/MessageBuilder.cpp @@ -18,11 +18,11 @@ * under the License. * */ -#include "MessageBuilder.h" +#include "qpid/broker/MessageBuilder.h" -#include "Message.h" -#include "MessageStore.h" -#include "NullMessageStore.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/NullMessageStore.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/cpp/src/qpid/broker/MessageBuilder.h index 1f5a2a8b84..e63c108097 100644 --- a/cpp/src/qpid/broker/MessageBuilder.h +++ b/cpp/src/qpid/broker/MessageBuilder.h @@ -21,7 +21,7 @@ #ifndef _MessageBuilder_ #define _MessageBuilder_ -#include "BrokerImportExport.h" +#include "qpid/broker/BrokerImportExport.h" #include "qpid/framing/FrameHandler.h" #include "qpid/framing/SequenceNumber.h" #include "qpid/RefCounted.h" diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h index 3d8bbbb02c..363a474c22 100644 --- a/cpp/src/qpid/broker/MessageStore.h +++ b/cpp/src/qpid/broker/MessageStore.h @@ -21,12 +21,12 @@ #ifndef _MessageStore_ #define _MessageStore_ -#include "PersistableExchange.h" -#include "PersistableMessage.h" -#include "PersistableQueue.h" -#include "PersistableConfig.h" -#include "RecoveryManager.h" -#include "TransactionalStore.h" +#include "qpid/broker/PersistableExchange.h" +#include "qpid/broker/PersistableMessage.h" +#include "qpid/broker/PersistableQueue.h" +#include "qpid/broker/PersistableConfig.h" +#include "qpid/broker/RecoveryManager.h" +#include "qpid/broker/TransactionalStore.h" #include "qpid/framing/FieldTable.h" #include <qpid/Options.h> diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/cpp/src/qpid/broker/MessageStoreModule.cpp index 66ce73e8a0..bf2a27b539 100644 --- a/cpp/src/qpid/broker/MessageStoreModule.cpp +++ b/cpp/src/qpid/broker/MessageStoreModule.cpp @@ -19,8 +19,8 @@ * */ -#include "MessageStoreModule.h" -#include "NullMessageStore.h" +#include "qpid/broker/MessageStoreModule.h" +#include "qpid/broker/NullMessageStore.h" #include <iostream> // This transfer protects against the unloading of the store lib prior to the handling of the exception diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h index 774bc8f8eb..d6963336fc 100644 --- a/cpp/src/qpid/broker/MessageStoreModule.h +++ b/cpp/src/qpid/broker/MessageStoreModule.h @@ -21,9 +21,9 @@ #ifndef _MessageStoreModule_ #define _MessageStoreModule_ -#include "MessageStore.h" -#include "Queue.h" -#include "RecoveryManager.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/RecoveryManager.h" #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/cpp/src/qpid/broker/NameGenerator.cpp index 8484f921e9..e7f193d546 100644 --- a/cpp/src/qpid/broker/NameGenerator.cpp +++ b/cpp/src/qpid/broker/NameGenerator.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "NameGenerator.h" +#include "qpid/broker/NameGenerator.h" #include <sstream> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp index f5b0163c0f..87431453af 100644 --- a/cpp/src/qpid/broker/NullMessageStore.cpp +++ b/cpp/src/qpid/broker/NullMessageStore.cpp @@ -19,9 +19,9 @@ * */ -#include "NullMessageStore.h" -#include "MessageStoreModule.h" -#include "RecoveryManager.h" +#include "qpid/broker/NullMessageStore.h" +#include "qpid/broker/MessageStoreModule.h" +#include "qpid/broker/RecoveryManager.h" #include "qpid/log/Statement.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h index 552ea05272..48d0e1ea22 100644 --- a/cpp/src/qpid/broker/NullMessageStore.h +++ b/cpp/src/qpid/broker/NullMessageStore.h @@ -22,9 +22,9 @@ #define _NullMessageStore_ #include <set> -#include "BrokerImportExport.h" -#include "MessageStore.h" -#include "Queue.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/Queue.h" #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/PersistableConfig.h b/cpp/src/qpid/broker/PersistableConfig.h index 914e91ea80..8ddb84d129 100644 --- a/cpp/src/qpid/broker/PersistableConfig.h +++ b/cpp/src/qpid/broker/PersistableConfig.h @@ -23,7 +23,7 @@ */ #include <string> -#include "Persistable.h" +#include "qpid/broker/Persistable.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/PersistableExchange.h b/cpp/src/qpid/broker/PersistableExchange.h index 683b740ddc..e1a0853247 100644 --- a/cpp/src/qpid/broker/PersistableExchange.h +++ b/cpp/src/qpid/broker/PersistableExchange.h @@ -23,7 +23,7 @@ */ #include <string> -#include "Persistable.h" +#include "qpid/broker/Persistable.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/cpp/src/qpid/broker/PersistableMessage.cpp index 655179bfd4..c1f86d4ca4 100644 --- a/cpp/src/qpid/broker/PersistableMessage.cpp +++ b/cpp/src/qpid/broker/PersistableMessage.cpp @@ -20,8 +20,8 @@ */ -#include "PersistableMessage.h" -#include "MessageStore.h" +#include "qpid/broker/PersistableMessage.h" +#include "qpid/broker/MessageStore.h" #include <iostream> using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/PersistableMessage.h b/cpp/src/qpid/broker/PersistableMessage.h index ae96d3ab32..05de9ff4c3 100644 --- a/cpp/src/qpid/broker/PersistableMessage.h +++ b/cpp/src/qpid/broker/PersistableMessage.h @@ -26,11 +26,11 @@ #include <list> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -#include "BrokerImportExport.h" -#include "Persistable.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Persistable.h" #include "qpid/framing/amqp_types.h" #include "qpid/sys/Mutex.h" -#include "PersistableQueue.h" +#include "qpid/broker/PersistableQueue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/PersistableQueue.h b/cpp/src/qpid/broker/PersistableQueue.h index 9236814ae3..8d85d36fef 100644 --- a/cpp/src/qpid/broker/PersistableQueue.h +++ b/cpp/src/qpid/broker/PersistableQueue.h @@ -23,7 +23,7 @@ */ #include <string> -#include "Persistable.h" +#include "qpid/broker/Persistable.h" #include "qpid/management/Manageable.h" #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index a421d16c72..ee5831fed0 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -19,14 +19,14 @@ * */ -#include "Broker.h" -#include "Queue.h" -#include "QueueEvents.h" -#include "Exchange.h" -#include "DeliverableMessage.h" -#include "MessageStore.h" -#include "NullMessageStore.h" -#include "QueueRegistry.h" +#include "qpid/broker/Broker.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/QueueEvents.h" +#include "qpid/broker/Exchange.h" +#include "qpid/broker/DeliverableMessage.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/NullMessageStore.h" +#include "qpid/broker/QueueRegistry.h" #include "qpid/StringUtils.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h index 777ef5e35a..475766ae30 100644 --- a/cpp/src/qpid/broker/Queue.h +++ b/cpp/src/qpid/broker/Queue.h @@ -22,15 +22,15 @@ * */ -#include "BrokerImportExport.h" -#include "OwnershipToken.h" -#include "Consumer.h" -#include "Message.h" -#include "PersistableQueue.h" -#include "QueuePolicy.h" -#include "QueueBindings.h" -#include "QueueListeners.h" -#include "RateTracker.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/OwnershipToken.h" +#include "qpid/broker/Consumer.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/PersistableQueue.h" +#include "qpid/broker/QueuePolicy.h" +#include "qpid/broker/QueueBindings.h" +#include "qpid/broker/QueueListeners.h" +#include "qpid/broker/RateTracker.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Monitor.h" diff --git a/cpp/src/qpid/broker/QueueBindings.cpp b/cpp/src/qpid/broker/QueueBindings.cpp index 6a1fa6aca3..3f43a8ef68 100644 --- a/cpp/src/qpid/broker/QueueBindings.cpp +++ b/cpp/src/qpid/broker/QueueBindings.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "QueueBindings.h" -#include "ExchangeRegistry.h" +#include "qpid/broker/QueueBindings.h" +#include "qpid/broker/ExchangeRegistry.h" #include "qpid/framing/reply_exceptions.h" using qpid::framing::FieldTable; diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/cpp/src/qpid/broker/QueueCleaner.cpp index 0774dce2b7..7a75ed013b 100644 --- a/cpp/src/qpid/broker/QueueCleaner.cpp +++ b/cpp/src/qpid/broker/QueueCleaner.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "QueueCleaner.h" +#include "qpid/broker/QueueCleaner.h" -#include "Broker.h" +#include "qpid/broker/Broker.h" #include <boost/bind.hpp> namespace qpid { diff --git a/cpp/src/qpid/broker/QueueCleaner.h b/cpp/src/qpid/broker/QueueCleaner.h index 007826f33e..1ae72c19f5 100644 --- a/cpp/src/qpid/broker/QueueCleaner.h +++ b/cpp/src/qpid/broker/QueueCleaner.h @@ -22,8 +22,8 @@ * */ -#include "BrokerImportExport.h" -#include "Timer.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Timer.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/QueueEvents.cpp b/cpp/src/qpid/broker/QueueEvents.cpp index c501a0ffbc..6df869673d 100644 --- a/cpp/src/qpid/broker/QueueEvents.cpp +++ b/cpp/src/qpid/broker/QueueEvents.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "QueueEvents.h" +#include "qpid/broker/QueueEvents.h" #include "qpid/Exception.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/broker/QueueEvents.h b/cpp/src/qpid/broker/QueueEvents.h index a3d4ea42f9..6826c6e79a 100644 --- a/cpp/src/qpid/broker/QueueEvents.h +++ b/cpp/src/qpid/broker/QueueEvents.h @@ -22,8 +22,8 @@ * */ -#include "BrokerImportExport.h" -#include "QueuedMessage.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/QueuedMessage.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/PollableQueue.h" #include <map> diff --git a/cpp/src/qpid/broker/QueueListeners.cpp b/cpp/src/qpid/broker/QueueListeners.cpp index 6b3d90906c..99f30544e2 100644 --- a/cpp/src/qpid/broker/QueueListeners.cpp +++ b/cpp/src/qpid/broker/QueueListeners.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "QueueListeners.h" +#include "qpid/broker/QueueListeners.h" #include <boost/bind.hpp> namespace qpid { diff --git a/cpp/src/qpid/broker/QueueListeners.h b/cpp/src/qpid/broker/QueueListeners.h index 32260dd736..9bb847ff94 100644 --- a/cpp/src/qpid/broker/QueueListeners.h +++ b/cpp/src/qpid/broker/QueueListeners.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "Consumer.h" +#include "qpid/broker/Consumer.h" #include <vector> namespace qpid { diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/cpp/src/qpid/broker/QueuePolicy.cpp index 368bd6552d..39afe90134 100644 --- a/cpp/src/qpid/broker/QueuePolicy.cpp +++ b/cpp/src/qpid/broker/QueuePolicy.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "QueuePolicy.h" -#include "Queue.h" +#include "qpid/broker/QueuePolicy.h" +#include "qpid/broker/Queue.h" #include "qpid/Exception.h" #include "qpid/framing/FieldValue.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/broker/QueuePolicy.h b/cpp/src/qpid/broker/QueuePolicy.h index 93e0cc73be..54745876d5 100644 --- a/cpp/src/qpid/broker/QueuePolicy.h +++ b/cpp/src/qpid/broker/QueuePolicy.h @@ -24,8 +24,8 @@ #include <deque> #include <iostream> #include <memory> -#include "BrokerImportExport.h" -#include "QueuedMessage.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/QueuedMessage.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/AtomicValue.h" #include "qpid/sys/Mutex.h" diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/cpp/src/qpid/broker/QueueRegistry.cpp index 60182e1ead..4b1fa62709 100644 --- a/cpp/src/qpid/broker/QueueRegistry.cpp +++ b/cpp/src/qpid/broker/QueueRegistry.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "QueueRegistry.h" -#include "QueueEvents.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/broker/QueueEvents.h" #include "qpid/log/Statement.h" #include <sstream> #include <assert.h> diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h index a4ea65f18c..c134f399c8 100644 --- a/cpp/src/qpid/broker/QueueRegistry.h +++ b/cpp/src/qpid/broker/QueueRegistry.h @@ -21,8 +21,8 @@ #ifndef _QueueRegistry_ #define _QueueRegistry_ -#include "BrokerImportExport.h" -#include "Queue.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Queue.h" #include "qpid/sys/Mutex.h" #include "qpid/management/Manageable.h" #include <boost/bind.hpp> diff --git a/cpp/src/qpid/broker/QueuedMessage.h b/cpp/src/qpid/broker/QueuedMessage.h index 82f5073d87..ccc9b539df 100644 --- a/cpp/src/qpid/broker/QueuedMessage.h +++ b/cpp/src/qpid/broker/QueuedMessage.h @@ -21,7 +21,7 @@ #ifndef _QueuedMessage_ #define _QueuedMessage_ -#include "Message.h" +#include "qpid/broker/Message.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/RateTracker.cpp b/cpp/src/qpid/broker/RateTracker.cpp index fc88d99cfa..048349b658 100644 --- a/cpp/src/qpid/broker/RateTracker.cpp +++ b/cpp/src/qpid/broker/RateTracker.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RateTracker.h" +#include "qpid/broker/RateTracker.h" using qpid::sys::AbsTime; using qpid::sys::Duration; diff --git a/cpp/src/qpid/broker/RecoverableQueue.h b/cpp/src/qpid/broker/RecoverableQueue.h index b32bae7f07..49f05f97a1 100644 --- a/cpp/src/qpid/broker/RecoverableQueue.h +++ b/cpp/src/qpid/broker/RecoverableQueue.h @@ -22,7 +22,7 @@ * */ -#include "RecoverableMessage.h" +#include "qpid/broker/RecoverableMessage.h" #include <boost/shared_ptr.hpp> namespace qpid { diff --git a/cpp/src/qpid/broker/RecoverableTransaction.h b/cpp/src/qpid/broker/RecoverableTransaction.h index 7fe34b6756..1b7d94bd1a 100644 --- a/cpp/src/qpid/broker/RecoverableTransaction.h +++ b/cpp/src/qpid/broker/RecoverableTransaction.h @@ -24,8 +24,8 @@ #include <boost/shared_ptr.hpp> -#include "RecoverableMessage.h" -#include "RecoverableQueue.h" +#include "qpid/broker/RecoverableMessage.h" +#include "qpid/broker/RecoverableQueue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/RecoveredDequeue.cpp b/cpp/src/qpid/broker/RecoveredDequeue.cpp index e2d70964fb..c4dd6d5f87 100644 --- a/cpp/src/qpid/broker/RecoveredDequeue.cpp +++ b/cpp/src/qpid/broker/RecoveredDequeue.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RecoveredDequeue.h" +#include "qpid/broker/RecoveredDequeue.h" using boost::intrusive_ptr; using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/RecoveredDequeue.h b/cpp/src/qpid/broker/RecoveredDequeue.h index ef6b8f1f74..67b37db5f9 100644 --- a/cpp/src/qpid/broker/RecoveredDequeue.h +++ b/cpp/src/qpid/broker/RecoveredDequeue.h @@ -21,11 +21,11 @@ #ifndef _RecoveredDequeue_ #define _RecoveredDequeue_ -#include "Deliverable.h" -#include "Message.h" -#include "MessageStore.h" -#include "Queue.h" -#include "TxOp.h" +#include "qpid/broker/Deliverable.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/TxOp.h" #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.cpp b/cpp/src/qpid/broker/RecoveredEnqueue.cpp index 1984a5d4a8..419c9771fc 100644 --- a/cpp/src/qpid/broker/RecoveredEnqueue.cpp +++ b/cpp/src/qpid/broker/RecoveredEnqueue.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RecoveredEnqueue.h" +#include "qpid/broker/RecoveredEnqueue.h" using boost::intrusive_ptr; using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.h b/cpp/src/qpid/broker/RecoveredEnqueue.h index 2d97768e65..09f928f098 100644 --- a/cpp/src/qpid/broker/RecoveredEnqueue.h +++ b/cpp/src/qpid/broker/RecoveredEnqueue.h @@ -21,11 +21,11 @@ #ifndef _RecoveredEnqueue_ #define _RecoveredEnqueue_ -#include "Deliverable.h" -#include "Message.h" -#include "MessageStore.h" -#include "Queue.h" -#include "TxOp.h" +#include "qpid/broker/Deliverable.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/TxOp.h" #include <boost/intrusive_ptr.hpp> diff --git a/cpp/src/qpid/broker/RecoveryManager.h b/cpp/src/qpid/broker/RecoveryManager.h index 7dcbe3a2b0..2929e92250 100644 --- a/cpp/src/qpid/broker/RecoveryManager.h +++ b/cpp/src/qpid/broker/RecoveryManager.h @@ -21,12 +21,12 @@ #ifndef _RecoveryManager_ #define _RecoveryManager_ -#include "RecoverableExchange.h" -#include "RecoverableQueue.h" -#include "RecoverableMessage.h" -#include "RecoverableTransaction.h" -#include "RecoverableConfig.h" -#include "TransactionalStore.h" +#include "qpid/broker/RecoverableExchange.h" +#include "qpid/broker/RecoverableQueue.h" +#include "qpid/broker/RecoverableMessage.h" +#include "qpid/broker/RecoverableTransaction.h" +#include "qpid/broker/RecoverableConfig.h" +#include "qpid/broker/TransactionalStore.h" #include "qpid/framing/Buffer.h" namespace qpid { diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp index edddfc6db8..2a19115fd1 100644 --- a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp +++ b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp @@ -18,14 +18,14 @@ * under the License. * */ -#include "RecoveryManagerImpl.h" - -#include "Message.h" -#include "Queue.h" -#include "Link.h" -#include "Bridge.h" -#include "RecoveredEnqueue.h" -#include "RecoveredDequeue.h" +#include "qpid/broker/RecoveryManagerImpl.h" + +#include "qpid/broker/Message.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/Link.h" +#include "qpid/broker/Bridge.h" +#include "qpid/broker/RecoveredEnqueue.h" +#include "qpid/broker/RecoveredDequeue.h" #include "qpid/framing/reply_exceptions.h" using boost::dynamic_pointer_cast; diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.h b/cpp/src/qpid/broker/RecoveryManagerImpl.h index cd34d464f5..6fbbfc4a6c 100644 --- a/cpp/src/qpid/broker/RecoveryManagerImpl.h +++ b/cpp/src/qpid/broker/RecoveryManagerImpl.h @@ -22,11 +22,11 @@ #define _RecoveryManagerImpl_ #include <list> -#include "DtxManager.h" -#include "ExchangeRegistry.h" -#include "QueueRegistry.h" -#include "LinkRegistry.h" -#include "RecoveryManager.h" +#include "qpid/broker/DtxManager.h" +#include "qpid/broker/ExchangeRegistry.h" +#include "qpid/broker/QueueRegistry.h" +#include "qpid/broker/LinkRegistry.h" +#include "qpid/broker/RecoveryManager.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/RetryList.cpp b/cpp/src/qpid/broker/RetryList.cpp index e3a077bd95..8f600c086d 100644 --- a/cpp/src/qpid/broker/RetryList.cpp +++ b/cpp/src/qpid/broker/RetryList.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RetryList.h" +#include "qpid/broker/RetryList.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/RetryList.h b/cpp/src/qpid/broker/RetryList.h index 3cdba72ecf..f87adf2c8d 100644 --- a/cpp/src/qpid/broker/RetryList.h +++ b/cpp/src/qpid/broker/RetryList.h @@ -22,7 +22,7 @@ * */ -#include "BrokerImportExport.h" +#include "qpid/broker/BrokerImportExport.h" #include "qpid/Address.h" #include "qpid/Url.h" diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/cpp/src/qpid/broker/SaslAuthenticator.cpp index edc66444ec..7e7334fda1 100644 --- a/cpp/src/qpid/broker/SaslAuthenticator.cpp +++ b/cpp/src/qpid/broker/SaslAuthenticator.cpp @@ -23,7 +23,7 @@ # include "config.h" #endif -#include "Connection.h" +#include "qpid/broker/Connection.h" #include "qpid/log/Statement.h" #include "qpid/framing/reply_exceptions.h" #include <boost/format.hpp> diff --git a/cpp/src/qpid/broker/SecureConnection.cpp b/cpp/src/qpid/broker/SecureConnection.cpp index 4a9946e176..74aec239ca 100644 --- a/cpp/src/qpid/broker/SecureConnection.cpp +++ b/cpp/src/qpid/broker/SecureConnection.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "SecureConnection.h" +#include "qpid/broker/SecureConnection.h" #include "qpid/sys/SecurityLayer.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/broker/SecureConnectionFactory.cpp b/cpp/src/qpid/broker/SecureConnectionFactory.cpp index 38fd96bcba..e1f003cb1c 100644 --- a/cpp/src/qpid/broker/SecureConnectionFactory.cpp +++ b/cpp/src/qpid/broker/SecureConnectionFactory.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "SecureConnectionFactory.h" +#include "qpid/broker/SecureConnectionFactory.h" #include "qpid/framing/ProtocolVersion.h" #include "qpid/amqp_0_10/Connection.h" #include "qpid/broker/Connection.h" diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index 40c9bf296e..d77bd9b7ca 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/cpp/src/qpid/broker/SemanticState.cpp @@ -19,21 +19,21 @@ * */ -#include "SessionState.h" -#include "Connection.h" -#include "DeliverableMessage.h" -#include "DtxAck.h" -#include "DtxTimeout.h" -#include "Message.h" -#include "Queue.h" -#include "SessionContext.h" -#include "TxAccept.h" -#include "TxPublish.h" +#include "qpid/broker/SessionState.h" +#include "qpid/broker/Connection.h" +#include "qpid/broker/DeliverableMessage.h" +#include "qpid/broker/DtxAck.h" +#include "qpid/broker/DtxTimeout.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/SessionContext.h" +#include "qpid/broker/TxAccept.h" +#include "qpid/broker/TxPublish.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/log/Statement.h" #include "qpid/ptr_map.h" -#include "AclModule.h" +#include "qpid/broker/AclModule.h" #include <boost/bind.hpp> #include <boost/format.hpp> diff --git a/cpp/src/qpid/broker/SemanticState.h b/cpp/src/qpid/broker/SemanticState.h index 0f2e08cb3c..4b87c59c68 100644 --- a/cpp/src/qpid/broker/SemanticState.h +++ b/cpp/src/qpid/broker/SemanticState.h @@ -22,14 +22,14 @@ * */ -#include "Consumer.h" -#include "Deliverable.h" -#include "DeliveryAdapter.h" -#include "DeliveryRecord.h" -#include "DtxBuffer.h" -#include "DtxManager.h" -#include "NameGenerator.h" -#include "TxBuffer.h" +#include "qpid/broker/Consumer.h" +#include "qpid/broker/Deliverable.h" +#include "qpid/broker/DeliveryAdapter.h" +#include "qpid/broker/DeliveryRecord.h" +#include "qpid/broker/DtxBuffer.h" +#include "qpid/broker/DtxManager.h" +#include "qpid/broker/NameGenerator.h" +#include "qpid/broker/TxBuffer.h" #include "qpid/framing/FrameHandler.h" #include "qpid/framing/SequenceSet.h" @@ -37,7 +37,7 @@ #include "qpid/sys/AggregateOutput.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/AtomicValue.h" -#include "AclModule.h" +#include "qpid/broker/AclModule.h" #include <list> #include <map> diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp index 8217a46941..e52274597e 100644 --- a/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/cpp/src/qpid/broker/SessionAdapter.cpp @@ -15,9 +15,9 @@ * limitations under the License. * */ -#include "SessionAdapter.h" -#include "Connection.h" -#include "Queue.h" +#include "qpid/broker/SessionAdapter.h" +#include "qpid/broker/Connection.h" +#include "qpid/broker/Queue.h" #include "qpid/Exception.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/framing/enum.h" diff --git a/cpp/src/qpid/broker/SessionAdapter.h b/cpp/src/qpid/broker/SessionAdapter.h index 6f3b598398..b69f258037 100644 --- a/cpp/src/qpid/broker/SessionAdapter.h +++ b/cpp/src/qpid/broker/SessionAdapter.h @@ -19,10 +19,10 @@ * */ -#include "HandlerImpl.h" +#include "qpid/broker/HandlerImpl.h" -#include "ConnectionToken.h" -#include "OwnershipToken.h" +#include "qpid/broker/ConnectionToken.h" +#include "qpid/broker/OwnershipToken.h" #include "qpid/Exception.h" #include "qpid/framing/AMQP_ServerOperations.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/broker/SessionContext.h b/cpp/src/qpid/broker/SessionContext.h index 7bc14daf5d..cfdbd100c3 100644 --- a/cpp/src/qpid/broker/SessionContext.h +++ b/cpp/src/qpid/broker/SessionContext.h @@ -26,8 +26,8 @@ #include "qpid/framing/AMQP_ClientProxy.h" #include "qpid/framing/amqp_types.h" #include "qpid/sys/OutputControl.h" -#include "ConnectionState.h" -#include "OwnershipToken.h" +#include "qpid/broker/ConnectionState.h" +#include "qpid/broker/OwnershipToken.h" #include <boost/noncopyable.hpp> diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/cpp/src/qpid/broker/SessionHandler.cpp index ca1f875991..7106f85807 100644 --- a/cpp/src/qpid/broker/SessionHandler.cpp +++ b/cpp/src/qpid/broker/SessionHandler.cpp @@ -18,9 +18,9 @@ * */ -#include "SessionHandler.h" -#include "SessionState.h" -#include "Connection.h" +#include "qpid/broker/SessionHandler.h" +#include "qpid/broker/SessionState.h" +#include "qpid/broker/Connection.h" #include "qpid/log/Statement.h" #include <boost/bind.hpp> diff --git a/cpp/src/qpid/broker/SessionManager.cpp b/cpp/src/qpid/broker/SessionManager.cpp index a35488b746..996a02f4c6 100644 --- a/cpp/src/qpid/broker/SessionManager.cpp +++ b/cpp/src/qpid/broker/SessionManager.cpp @@ -19,8 +19,8 @@ * */ -#include "SessionManager.h" -#include "SessionState.h" +#include "qpid/broker/SessionManager.h" +#include "qpid/broker/SessionState.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/log/Statement.h" #include "qpid/log/Helpers.h" diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp index b465a65bd3..1c8e3ffebc 100644 --- a/cpp/src/qpid/broker/SessionState.cpp +++ b/cpp/src/qpid/broker/SessionState.cpp @@ -18,14 +18,14 @@ * under the License. * */ -#include "SessionState.h" -#include "Broker.h" -#include "ConnectionState.h" -#include "DeliveryRecord.h" -#include "SessionManager.h" -#include "SessionHandler.h" -#include "RateFlowcontrol.h" -#include "Timer.h" +#include "qpid/broker/SessionState.h" +#include "qpid/broker/Broker.h" +#include "qpid/broker/ConnectionState.h" +#include "qpid/broker/DeliveryRecord.h" +#include "qpid/broker/SessionManager.h" +#include "qpid/broker/SessionHandler.h" +#include "qpid/broker/RateFlowcontrol.h" +#include "qpid/broker/Timer.h" #include "qpid/framing/AMQContentBody.h" #include "qpid/framing/AMQHeaderBody.h" #include "qpid/framing/AMQMethodBody.h" diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h index f9d35e2aac..d66c449b06 100644 --- a/cpp/src/qpid/broker/SessionState.h +++ b/cpp/src/qpid/broker/SessionState.h @@ -28,12 +28,12 @@ #include "qpid/sys/Time.h" #include "qpid/management/Manageable.h" #include "qmf/org/apache/qpid/broker/Session.h" -#include "SessionAdapter.h" -#include "DeliveryAdapter.h" -#include "IncompleteMessageList.h" -#include "MessageBuilder.h" -#include "SessionContext.h" -#include "SemanticState.h" +#include "qpid/broker/SessionAdapter.h" +#include "qpid/broker/DeliveryAdapter.h" +#include "qpid/broker/IncompleteMessageList.h" +#include "qpid/broker/MessageBuilder.h" +#include "qpid/broker/SessionContext.h" +#include "qpid/broker/SemanticState.h" #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> diff --git a/cpp/src/qpid/broker/SignalHandler.cpp b/cpp/src/qpid/broker/SignalHandler.cpp index 7207b0f8ce..f4a3822554 100644 --- a/cpp/src/qpid/broker/SignalHandler.cpp +++ b/cpp/src/qpid/broker/SignalHandler.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "SignalHandler.h" -#include "Broker.h" +#include "qpid/broker/SignalHandler.h" +#include "qpid/broker/Broker.h" #include <signal.h> namespace qpid { diff --git a/cpp/src/qpid/broker/System.cpp b/cpp/src/qpid/broker/System.cpp index 86933109a1..455ad11cf2 100644 --- a/cpp/src/qpid/broker/System.cpp +++ b/cpp/src/qpid/broker/System.cpp @@ -17,8 +17,8 @@ // under the License. // -#include "System.h" -#include "Broker.h" +#include "qpid/broker/System.h" +#include "qpid/broker/Broker.h" #include "qpid/management/ManagementAgent.h" #include "qpid/framing/Uuid.h" #include "qpid/sys/SystemInfo.h" diff --git a/cpp/src/qpid/broker/Timer.cpp b/cpp/src/qpid/broker/Timer.cpp index 7832204e2a..74d208eceb 100644 --- a/cpp/src/qpid/broker/Timer.cpp +++ b/cpp/src/qpid/broker/Timer.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Timer.h" +#include "qpid/broker/Timer.h" #include <iostream> using boost::intrusive_ptr; diff --git a/cpp/src/qpid/broker/Timer.h b/cpp/src/qpid/broker/Timer.h index 7218fb0e79..223f87eab6 100644 --- a/cpp/src/qpid/broker/Timer.h +++ b/cpp/src/qpid/broker/Timer.h @@ -21,7 +21,7 @@ #ifndef _Timer_ #define _Timer_ -#include "BrokerImportExport.h" +#include "qpid/broker/BrokerImportExport.h" #include "qpid/sys/Monitor.h" #include "qpid/sys/Thread.h" #include "qpid/sys/Runnable.h" diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/cpp/src/qpid/broker/TopicExchange.cpp index 4a22d91839..6c8832179f 100644 --- a/cpp/src/qpid/broker/TopicExchange.cpp +++ b/cpp/src/qpid/broker/TopicExchange.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "TopicExchange.h" +#include "qpid/broker/TopicExchange.h" #include <algorithm> diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h index 4b507cb710..3bbf143889 100644 --- a/cpp/src/qpid/broker/TopicExchange.h +++ b/cpp/src/qpid/broker/TopicExchange.h @@ -23,11 +23,11 @@ #include <map> #include <vector> -#include "BrokerImportExport.h" -#include "Exchange.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Exchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Monitor.h" -#include "Queue.h" +#include "qpid/broker/Queue.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/TxAccept.cpp b/cpp/src/qpid/broker/TxAccept.cpp index 15a1222a74..e47ac84990 100644 --- a/cpp/src/qpid/broker/TxAccept.cpp +++ b/cpp/src/qpid/broker/TxAccept.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "TxAccept.h" +#include "qpid/broker/TxAccept.h" #include "qpid/log/Statement.h" using std::bind1st; diff --git a/cpp/src/qpid/broker/TxAccept.h b/cpp/src/qpid/broker/TxAccept.h index 0a5fdedb0a..314a150176 100644 --- a/cpp/src/qpid/broker/TxAccept.h +++ b/cpp/src/qpid/broker/TxAccept.h @@ -25,8 +25,8 @@ #include <functional> #include <list> #include "qpid/framing/SequenceSet.h" -#include "DeliveryRecord.h" -#include "TxOp.h" +#include "qpid/broker/DeliveryRecord.h" +#include "qpid/broker/TxOp.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/cpp/src/qpid/broker/TxBuffer.cpp index ae18e0f318..b509778e89 100644 --- a/cpp/src/qpid/broker/TxBuffer.cpp +++ b/cpp/src/qpid/broker/TxBuffer.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "TxBuffer.h" +#include "qpid/broker/TxBuffer.h" #include "qpid/log/Statement.h" #include <boost/mem_fn.hpp> diff --git a/cpp/src/qpid/broker/TxBuffer.h b/cpp/src/qpid/broker/TxBuffer.h index f63a65f115..d49c8ba16a 100644 --- a/cpp/src/qpid/broker/TxBuffer.h +++ b/cpp/src/qpid/broker/TxBuffer.h @@ -24,9 +24,9 @@ #include <algorithm> #include <functional> #include <vector> -#include "BrokerImportExport.h" -#include "TransactionalStore.h" -#include "TxOp.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/TransactionalStore.h" +#include "qpid/broker/TxOp.h" /** * Represents a single transaction. As such, an instance of this class diff --git a/cpp/src/qpid/broker/TxOp.h b/cpp/src/qpid/broker/TxOp.h index e0e17fc0dc..a8fa1c2621 100644 --- a/cpp/src/qpid/broker/TxOp.h +++ b/cpp/src/qpid/broker/TxOp.h @@ -21,8 +21,8 @@ #ifndef _TxOp_ #define _TxOp_ -#include "TxOpVisitor.h" -#include "TransactionalStore.h" +#include "qpid/broker/TxOpVisitor.h" +#include "qpid/broker/TransactionalStore.h" #include <boost/shared_ptr.hpp> namespace qpid { diff --git a/cpp/src/qpid/broker/TxPublish.cpp b/cpp/src/qpid/broker/TxPublish.cpp index 25ac691ada..17b99fd883 100644 --- a/cpp/src/qpid/broker/TxPublish.cpp +++ b/cpp/src/qpid/broker/TxPublish.cpp @@ -19,7 +19,7 @@ * */ #include "qpid/log/Statement.h" -#include "TxPublish.h" +#include "qpid/broker/TxPublish.h" using boost::intrusive_ptr; using namespace qpid::broker; diff --git a/cpp/src/qpid/broker/TxPublish.h b/cpp/src/qpid/broker/TxPublish.h index ebe3b51f3d..d5cf5639c4 100644 --- a/cpp/src/qpid/broker/TxPublish.h +++ b/cpp/src/qpid/broker/TxPublish.h @@ -21,12 +21,12 @@ #ifndef _TxPublish_ #define _TxPublish_ -#include "BrokerImportExport.h" -#include "Queue.h" -#include "Deliverable.h" -#include "Message.h" -#include "MessageStore.h" -#include "TxOp.h" +#include "qpid/broker/BrokerImportExport.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/Deliverable.h" +#include "qpid/broker/Message.h" +#include "qpid/broker/MessageStore.h" +#include "qpid/broker/TxOp.h" #include <algorithm> #include <functional> diff --git a/cpp/src/qpid/broker/Vhost.cpp b/cpp/src/qpid/broker/Vhost.cpp index aa7683d318..df37cba255 100644 --- a/cpp/src/qpid/broker/Vhost.cpp +++ b/cpp/src/qpid/broker/Vhost.cpp @@ -17,8 +17,8 @@ // under the License. // -#include "Vhost.h" -#include "Broker.h" +#include "qpid/broker/Vhost.h" +#include "qpid/broker/Broker.h" #include "qpid/management/ManagementAgent.h" using namespace qpid::broker; diff --git a/cpp/src/qpid/client/AckMode.h b/cpp/src/qpid/client/AckMode.h deleted file mode 100644 index b411c322d8..0000000000 --- a/cpp/src/qpid/client/AckMode.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _client_AckMode_h -#define _client_AckMode_h - - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -namespace qpid { -namespace client { - -/** - * DEPRECATED - * - * The available acknowledgement modes for Channel (now also deprecated). - */ -enum AckMode { - /** No acknowledgement will be sent, broker can - discard messages as soon as they are delivered - to a consumer using this mode. **/ - NO_ACK = 0, - /** Each message will be automatically - acknowledged as soon as it is delivered to the - application. **/ - AUTO_ACK = 1, - /** Acknowledgements will be sent automatically, - but not for each message. **/ - LAZY_ACK = 2, - /** The application is responsible for explicitly - acknowledging messages. **/ - CLIENT_ACK = 3 -}; - -}} // namespace qpid::client - -#endif diff --git a/cpp/src/qpid/client/Bounds.cpp b/cpp/src/qpid/client/Bounds.cpp index e2ddb5dfec..abb983a62e 100644 --- a/cpp/src/qpid/client/Bounds.cpp +++ b/cpp/src/qpid/client/Bounds.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Bounds.h" +#include "qpid/client/Bounds.h" #include "qpid/log/Statement.h" #include "qpid/sys/Waitable.h" diff --git a/cpp/src/qpid/client/Completion.cpp b/cpp/src/qpid/client/Completion.cpp index a57eb29d04..a97c8c3534 100644 --- a/cpp/src/qpid/client/Completion.cpp +++ b/cpp/src/qpid/client/Completion.cpp @@ -19,9 +19,9 @@ * */ -#include "Completion.h" -#include "CompletionImpl.h" -#include "PrivateImplRef.h" +#include "qpid/client/Completion.h" +#include "qpid/client/CompletionImpl.h" +#include "qpid/client/PrivateImplRef.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/Completion.h b/cpp/src/qpid/client/Completion.h index 1e383bb0b5..73b22119fd 100644 --- a/cpp/src/qpid/client/Completion.h +++ b/cpp/src/qpid/client/Completion.h @@ -22,8 +22,8 @@ * */ -#include "Handle.h" -#include "ClientImportExport.h" +#include "qpid/client/Handle.h" +#include "qpid/client/ClientImportExport.h" #include <string> namespace qpid { diff --git a/cpp/src/qpid/client/CompletionImpl.h b/cpp/src/qpid/client/CompletionImpl.h index cd88df79ed..f180708316 100644 --- a/cpp/src/qpid/client/CompletionImpl.h +++ b/cpp/src/qpid/client/CompletionImpl.h @@ -23,7 +23,7 @@ */ #include "qpid/RefCounted.h" -#include "Future.h" +#include "qpid/client/Future.h" #include <boost/shared_ptr.hpp> namespace qpid { diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp index b0d9406fad..6f2fc2262c 100644 --- a/cpp/src/qpid/client/Connection.cpp +++ b/cpp/src/qpid/client/Connection.cpp @@ -18,12 +18,12 @@ * under the License. * */ -#include "Connection.h" -#include "ConnectionImpl.h" -#include "ConnectionSettings.h" -#include "Message.h" -#include "SessionImpl.h" -#include "SessionBase_0_10Access.h" +#include "qpid/client/Connection.h" +#include "qpid/client/ConnectionImpl.h" +#include "qpid/client/ConnectionSettings.h" +#include "qpid/client/Message.h" +#include "qpid/client/SessionImpl.h" +#include "qpid/client/SessionBase_0_10Access.h" #include "qpid/Url.h" #include "qpid/log/Logger.h" #include "qpid/log/Options.h" diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/cpp/src/qpid/client/ConnectionHandler.cpp index db113cdf80..3d338af920 100644 --- a/cpp/src/qpid/client/ConnectionHandler.cpp +++ b/cpp/src/qpid/client/ConnectionHandler.cpp @@ -19,9 +19,9 @@ * */ -#include "ConnectionHandler.h" +#include "qpid/client/ConnectionHandler.h" -#include "SaslFactory.h" +#include "qpid/client/SaslFactory.h" #include "qpid/framing/amqp_framing.h" #include "qpid/framing/all_method_bodies.h" #include "qpid/framing/ClientInvoker.h" diff --git a/cpp/src/qpid/client/ConnectionHandler.h b/cpp/src/qpid/client/ConnectionHandler.h index b3b15e2f04..b1fd5be7c3 100644 --- a/cpp/src/qpid/client/ConnectionHandler.h +++ b/cpp/src/qpid/client/ConnectionHandler.h @@ -21,10 +21,10 @@ #ifndef _ConnectionHandler_ #define _ConnectionHandler_ -#include "ChainableFrameHandler.h" -#include "ConnectionSettings.h" -#include "Sasl.h" -#include "StateManager.h" +#include "qpid/client/ChainableFrameHandler.h" +#include "qpid/client/ConnectionSettings.h" +#include "qpid/client/Sasl.h" +#include "qpid/client/StateManager.h" #include "qpid/framing/AMQMethodBody.h" #include "qpid/framing/AMQP_HighestVersion.h" #include "qpid/framing/AMQP_ClientOperations.h" diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp index f1379296fd..45ad819ebd 100644 --- a/cpp/src/qpid/client/ConnectionImpl.cpp +++ b/cpp/src/qpid/client/ConnectionImpl.cpp @@ -18,11 +18,11 @@ * under the License. * */ -#include "ConnectionImpl.h" -#include "Connector.h" -#include "ConnectionSettings.h" -#include "SessionImpl.h" -#include "FailoverListener.h" +#include "qpid/client/ConnectionImpl.h" +#include "qpid/client/Connector.h" +#include "qpid/client/ConnectionSettings.h" +#include "qpid/client/SessionImpl.h" +#include "qpid/client/FailoverListener.h" #include "qpid/log/Statement.h" #include "qpid/Url.h" diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/cpp/src/qpid/client/ConnectionImpl.h index 431831b8a1..8c82b6a3fe 100644 --- a/cpp/src/qpid/client/ConnectionImpl.h +++ b/cpp/src/qpid/client/ConnectionImpl.h @@ -22,8 +22,8 @@ #ifndef _ConnectionImpl_ #define _ConnectionImpl_ -#include "Bounds.h" -#include "ConnectionHandler.h" +#include "qpid/client/Bounds.h" +#include "qpid/client/ConnectionHandler.h" #include "qpid/framing/FrameHandler.h" #include "qpid/sys/Mutex.h" diff --git a/cpp/src/qpid/client/ConnectionSettings.cpp b/cpp/src/qpid/client/ConnectionSettings.cpp index 5851917da6..35d78365ba 100644 --- a/cpp/src/qpid/client/ConnectionSettings.cpp +++ b/cpp/src/qpid/client/ConnectionSettings.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "ConnectionSettings.h" +#include "qpid/client/ConnectionSettings.h" #include "qpid/log/Logger.h" #include "qpid/sys/Socket.h" diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp index 9eb487a7e7..53e8bc5239 100644 --- a/cpp/src/qpid/client/Connector.cpp +++ b/cpp/src/qpid/client/Connector.cpp @@ -18,11 +18,11 @@ * under the License. * */ -#include "Connector.h" +#include "qpid/client/Connector.h" -#include "Bounds.h" -#include "ConnectionImpl.h" -#include "ConnectionSettings.h" +#include "qpid/client/Bounds.h" +#include "qpid/client/ConnectionImpl.h" +#include "qpid/client/ConnectionSettings.h" #include "qpid/log/Statement.h" #include "qpid/sys/Codec.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/client/Demux.cpp b/cpp/src/qpid/client/Demux.cpp index b774214ae4..abc23c75df 100644 --- a/cpp/src/qpid/client/Demux.cpp +++ b/cpp/src/qpid/client/Demux.cpp @@ -19,7 +19,7 @@ * */ -#include "Demux.h" +#include "qpid/client/Demux.h" #include "qpid/Exception.h" #include "qpid/framing/MessageTransferBody.h" diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp index 0eb1203e16..43cbf3aa4d 100644 --- a/cpp/src/qpid/client/Dispatcher.cpp +++ b/cpp/src/qpid/client/Dispatcher.cpp @@ -18,16 +18,16 @@ * under the License. * */ -#include "Dispatcher.h" -#include "SubscriptionImpl.h" -#include "SessionImpl.h" +#include "qpid/client/Dispatcher.h" +#include "qpid/client/SubscriptionImpl.h" +#include "qpid/client/SessionImpl.h" #include "qpid/framing/FrameSet.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/log/Statement.h" #include "qpid/sys/BlockingQueue.h" -#include "Message.h" -#include "MessageImpl.h" +#include "qpid/client/Message.h" +#include "qpid/client/MessageImpl.h" #include <boost/state_saver.hpp> diff --git a/cpp/src/qpid/client/Dispatcher.h b/cpp/src/qpid/client/Dispatcher.h index 4206b6ff15..74fdb90103 100644 --- a/cpp/src/qpid/client/Dispatcher.h +++ b/cpp/src/qpid/client/Dispatcher.h @@ -30,9 +30,9 @@ #include "qpid/sys/Mutex.h" #include "qpid/sys/Runnable.h" #include "qpid/sys/Thread.h" -#include "ClientImportExport.h" -#include "MessageListener.h" -#include "SubscriptionImpl.h" +#include "qpid/client/ClientImportExport.h" +#include "qpid/client/MessageListener.h" +#include "qpid/client/SubscriptionImpl.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/Execution.h b/cpp/src/qpid/client/Execution.h index 10674afde0..ad622af9c1 100644 --- a/cpp/src/qpid/client/Execution.h +++ b/cpp/src/qpid/client/Execution.h @@ -22,7 +22,7 @@ #define _Execution_ #include "qpid/framing/SequenceNumber.h" -#include "Demux.h" +#include "qpid/client/Demux.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/cpp/src/qpid/client/FailoverListener.cpp index ed9354d528..d84525ed89 100644 --- a/cpp/src/qpid/client/FailoverListener.cpp +++ b/cpp/src/qpid/client/FailoverListener.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "FailoverListener.h" -#include "SessionBase_0_10Access.h" +#include "qpid/client/FailoverListener.h" +#include "qpid/client/SessionBase_0_10Access.h" #include "qpid/client/SessionImpl.h" #include "qpid/client/ConnectionImpl.h" #include "qpid/client/SubscriptionImpl.h" diff --git a/cpp/src/qpid/client/FailoverManager.cpp b/cpp/src/qpid/client/FailoverManager.cpp index 86b50a0a61..967c3613c0 100644 --- a/cpp/src/qpid/client/FailoverManager.cpp +++ b/cpp/src/qpid/client/FailoverManager.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "FailoverManager.h" +#include "qpid/client/FailoverManager.h" #include "qpid/Exception.h" #include "qpid/log/Statement.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/client/FailoverManager.h b/cpp/src/qpid/client/FailoverManager.h index bef5e18840..581989c46a 100644 --- a/cpp/src/qpid/client/FailoverManager.h +++ b/cpp/src/qpid/client/FailoverManager.h @@ -22,8 +22,8 @@ * */ -#include "Connection.h" -#include "ConnectionSettings.h" +#include "qpid/client/Connection.h" +#include "qpid/client/ConnectionSettings.h" #include "qpid/Exception.h" #include "qpid/client/AsyncSession.h" #include "qpid/sys/Monitor.h" diff --git a/cpp/src/qpid/client/Future.cpp b/cpp/src/qpid/client/Future.cpp index fda40219ba..740cd3df59 100644 --- a/cpp/src/qpid/client/Future.cpp +++ b/cpp/src/qpid/client/Future.cpp @@ -19,8 +19,8 @@ * */ -#include "Future.h" -#include "SessionImpl.h" +#include "qpid/client/Future.h" +#include "qpid/client/SessionImpl.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/Future.h b/cpp/src/qpid/client/Future.h index 28c9a2bbbd..29d9044894 100644 --- a/cpp/src/qpid/client/Future.h +++ b/cpp/src/qpid/client/Future.h @@ -26,9 +26,9 @@ #include <boost/shared_ptr.hpp> #include "qpid/Exception.h" #include "qpid/framing/SequenceNumber.h" -#include "FutureCompletion.h" -#include "FutureResult.h" -#include "ClientImportExport.h" +#include "qpid/client/FutureCompletion.h" +#include "qpid/client/FutureResult.h" +#include "qpid/client/ClientImportExport.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/FutureCompletion.cpp b/cpp/src/qpid/client/FutureCompletion.cpp index 130c65d6aa..ccfb073855 100644 --- a/cpp/src/qpid/client/FutureCompletion.cpp +++ b/cpp/src/qpid/client/FutureCompletion.cpp @@ -19,7 +19,7 @@ * */ -#include "FutureCompletion.h" +#include "qpid/client/FutureCompletion.h" using namespace qpid::client; using namespace qpid::sys; diff --git a/cpp/src/qpid/client/FutureResult.cpp b/cpp/src/qpid/client/FutureResult.cpp index 007f278051..0237eb1464 100644 --- a/cpp/src/qpid/client/FutureResult.cpp +++ b/cpp/src/qpid/client/FutureResult.cpp @@ -19,9 +19,9 @@ * */ -#include "FutureResult.h" +#include "qpid/client/FutureResult.h" -#include "SessionImpl.h" +#include "qpid/client/SessionImpl.h" using namespace qpid::client; using namespace qpid::framing; diff --git a/cpp/src/qpid/client/FutureResult.h b/cpp/src/qpid/client/FutureResult.h index 64428c0341..1466378711 100644 --- a/cpp/src/qpid/client/FutureResult.h +++ b/cpp/src/qpid/client/FutureResult.h @@ -24,9 +24,9 @@ #include <string> -#include "ClientImportExport.h" +#include "qpid/client/ClientImportExport.h" #include "qpid/framing/amqp_framing.h" -#include "FutureCompletion.h" +#include "qpid/client/FutureCompletion.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/LocalQueue.cpp b/cpp/src/qpid/client/LocalQueue.cpp index eac4b458af..0019adabaf 100644 --- a/cpp/src/qpid/client/LocalQueue.cpp +++ b/cpp/src/qpid/client/LocalQueue.cpp @@ -18,15 +18,15 @@ * under the License. * */ -#include "LocalQueue.h" -#include "LocalQueueImpl.h" -#include "MessageImpl.h" +#include "qpid/client/LocalQueue.h" +#include "qpid/client/LocalQueueImpl.h" +#include "qpid/client/MessageImpl.h" #include "qpid/Exception.h" #include "qpid/framing/FrameSet.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/reply_exceptions.h" -#include "PrivateImplRef.h" -#include "SubscriptionImpl.h" +#include "qpid/client/PrivateImplRef.h" +#include "qpid/client/SubscriptionImpl.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/LocalQueue.h b/cpp/src/qpid/client/LocalQueue.h index aa7b098513..a584f74f05 100644 --- a/cpp/src/qpid/client/LocalQueue.h +++ b/cpp/src/qpid/client/LocalQueue.h @@ -22,9 +22,9 @@ * */ -#include "ClientImportExport.h" -#include "Handle.h" -#include "Message.h" +#include "qpid/client/ClientImportExport.h" +#include "qpid/client/Handle.h" +#include "qpid/client/Message.h" #include "qpid/sys/Time.h" namespace qpid { diff --git a/cpp/src/qpid/client/LocalQueueImpl.cpp b/cpp/src/qpid/client/LocalQueueImpl.cpp index 21ae768848..8b191728f4 100644 --- a/cpp/src/qpid/client/LocalQueueImpl.cpp +++ b/cpp/src/qpid/client/LocalQueueImpl.cpp @@ -18,15 +18,15 @@ * under the License. * */ -#include "LocalQueueImpl.h" -#include "MessageImpl.h" +#include "qpid/client/LocalQueueImpl.h" +#include "qpid/client/MessageImpl.h" #include "qpid/Exception.h" #include "qpid/framing/FrameSet.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/reply_exceptions.h" -#include "PrivateImplRef.h" -#include "SubscriptionImpl.h" -#include "CompletionImpl.h" +#include "qpid/client/PrivateImplRef.h" +#include "qpid/client/SubscriptionImpl.h" +#include "qpid/client/CompletionImpl.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/LocalQueueImpl.h b/cpp/src/qpid/client/LocalQueueImpl.h index 1afaa82d11..75b62cf203 100644 --- a/cpp/src/qpid/client/LocalQueueImpl.h +++ b/cpp/src/qpid/client/LocalQueueImpl.h @@ -22,8 +22,8 @@ * */ -#include "ClientImportExport.h" -#include "Handle.h" +#include "qpid/client/ClientImportExport.h" +#include "qpid/client/Handle.h" #include "qpid/client/Message.h" #include "qpid/client/Subscription.h" #include "qpid/client/Demux.h" diff --git a/cpp/src/qpid/client/Message.cpp b/cpp/src/qpid/client/Message.cpp index 501f7e7cd8..00f911c57e 100644 --- a/cpp/src/qpid/client/Message.cpp +++ b/cpp/src/qpid/client/Message.cpp @@ -19,8 +19,8 @@ * */ -#include "Message.h" -#include "MessageImpl.h" +#include "qpid/client/Message.h" +#include "qpid/client/MessageImpl.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/MessageImpl.cpp b/cpp/src/qpid/client/MessageImpl.cpp index 3d06fd1d8d..865c462b15 100644 --- a/cpp/src/qpid/client/MessageImpl.cpp +++ b/cpp/src/qpid/client/MessageImpl.cpp @@ -19,7 +19,7 @@ * */ -#include "MessageImpl.h" +#include "qpid/client/MessageImpl.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/MessageImpl.h b/cpp/src/qpid/client/MessageImpl.h index 8a529a4dde..a64ddd20d8 100644 --- a/cpp/src/qpid/client/MessageImpl.h +++ b/cpp/src/qpid/client/MessageImpl.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "Message.h" +#include "qpid/client/Message.h" #include "qpid/client/Session.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/TransferContent.h" diff --git a/cpp/src/qpid/client/MessageListener.cpp b/cpp/src/qpid/client/MessageListener.cpp index 68ebedeb0d..0f2a71287c 100644 --- a/cpp/src/qpid/client/MessageListener.cpp +++ b/cpp/src/qpid/client/MessageListener.cpp @@ -19,6 +19,6 @@ * */ -#include "MessageListener.h" +#include "qpid/client/MessageListener.h" qpid::client::MessageListener::~MessageListener() {} diff --git a/cpp/src/qpid/client/MessageListener.h b/cpp/src/qpid/client/MessageListener.h index b86aa10c54..c8e34eebb8 100644 --- a/cpp/src/qpid/client/MessageListener.h +++ b/cpp/src/qpid/client/MessageListener.h @@ -24,7 +24,7 @@ #ifndef _MessageListener_ #define _MessageListener_ -#include "Message.h" +#include "qpid/client/Message.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/MessageReplayTracker.cpp b/cpp/src/qpid/client/MessageReplayTracker.cpp index 9ffbb76837..0782f6e63d 100644 --- a/cpp/src/qpid/client/MessageReplayTracker.cpp +++ b/cpp/src/qpid/client/MessageReplayTracker.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "MessageReplayTracker.h" +#include "qpid/client/MessageReplayTracker.h" #include <boost/bind.hpp> namespace qpid { diff --git a/cpp/src/qpid/client/MessageReplayTracker.h b/cpp/src/qpid/client/MessageReplayTracker.h index 280cbae4a5..657ea07193 100644 --- a/cpp/src/qpid/client/MessageReplayTracker.h +++ b/cpp/src/qpid/client/MessageReplayTracker.h @@ -21,8 +21,8 @@ * under the License. * */ -#include "AsyncSession.h" -#include "Message.h" +#include "qpid/client/AsyncSession.h" +#include "qpid/client/Message.h" #include "qpid/client/ClientImportExport.h" #include <list> #include <string> diff --git a/cpp/src/qpid/client/QueueOptions.cpp b/cpp/src/qpid/client/QueueOptions.cpp index 5493c05044..f4c1483859 100644 --- a/cpp/src/qpid/client/QueueOptions.cpp +++ b/cpp/src/qpid/client/QueueOptions.cpp @@ -19,7 +19,7 @@ * */ -#include "QueueOptions.h" +#include "qpid/client/QueueOptions.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/QueueOptions.h b/cpp/src/qpid/client/QueueOptions.h index 57d9487217..702fc80656 100644 --- a/cpp/src/qpid/client/QueueOptions.h +++ b/cpp/src/qpid/client/QueueOptions.h @@ -19,7 +19,7 @@ * */ -#include "ClientImportExport.h" +#include "qpid/client/ClientImportExport.h" #include "qpid/framing/FieldTable.h" #ifndef _QueueOptions_ diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp index ad85104f3a..0aefcc04cf 100644 --- a/cpp/src/qpid/client/RdmaConnector.cpp +++ b/cpp/src/qpid/client/RdmaConnector.cpp @@ -18,11 +18,11 @@ * under the License. * */ -#include "Connector.h" +#include "qpid/client/Connector.h" -#include "Bounds.h" -#include "ConnectionImpl.h" -#include "ConnectionSettings.h" +#include "qpid/client/Bounds.h" +#include "qpid/client/ConnectionImpl.h" +#include "qpid/client/ConnectionSettings.h" #include "qpid/log/Statement.h" #include "qpid/sys/Time.h" #include "qpid/framing/AMQFrame.h" diff --git a/cpp/src/qpid/client/Results.cpp b/cpp/src/qpid/client/Results.cpp index 1b98d6c98a..acb2684727 100644 --- a/cpp/src/qpid/client/Results.cpp +++ b/cpp/src/qpid/client/Results.cpp @@ -19,8 +19,8 @@ * */ -#include "Results.h" -#include "FutureResult.h" +#include "qpid/client/Results.h" +#include "qpid/client/FutureResult.h" #include "qpid/framing/SequenceSet.h" using namespace qpid::framing; diff --git a/cpp/src/qpid/client/SaslFactory.cpp b/cpp/src/qpid/client/SaslFactory.cpp index ade301648c..884f527f01 100644 --- a/cpp/src/qpid/client/SaslFactory.cpp +++ b/cpp/src/qpid/client/SaslFactory.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "SaslFactory.h" -#include "ConnectionSettings.h" +#include "qpid/client/SaslFactory.h" +#include "qpid/client/ConnectionSettings.h" #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/cpp/src/qpid/client/SaslFactory.h b/cpp/src/qpid/client/SaslFactory.h index 60a1d60ff3..d012af06f7 100644 --- a/cpp/src/qpid/client/SaslFactory.h +++ b/cpp/src/qpid/client/SaslFactory.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "Sasl.h" +#include "qpid/client/Sasl.h" #include "qpid/sys/Mutex.h" #include <memory> diff --git a/cpp/src/qpid/client/SessionBase_0_10.cpp b/cpp/src/qpid/client/SessionBase_0_10.cpp index 03c0468107..1a345d534e 100644 --- a/cpp/src/qpid/client/SessionBase_0_10.cpp +++ b/cpp/src/qpid/client/SessionBase_0_10.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "SessionBase_0_10.h" -#include "Connection.h" +#include "qpid/client/SessionBase_0_10.h" +#include "qpid/client/Connection.h" #include "qpid/client/SessionImpl.h" #include "qpid/client/Future.h" #include "qpid/framing/all_method_bodies.h" diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp index 1623690f3d..43b62ec6dc 100644 --- a/cpp/src/qpid/client/SessionImpl.cpp +++ b/cpp/src/qpid/client/SessionImpl.cpp @@ -19,10 +19,10 @@ * */ -#include "SessionImpl.h" +#include "qpid/client/SessionImpl.h" -#include "ConnectionImpl.h" -#include "Future.h" +#include "qpid/client/ConnectionImpl.h" +#include "qpid/client/Future.h" #include "qpid/framing/all_method_bodies.h" #include "qpid/framing/ClientInvoker.h" diff --git a/cpp/src/qpid/client/SessionImpl.h b/cpp/src/qpid/client/SessionImpl.h index 4120f24011..cae1148e9f 100644 --- a/cpp/src/qpid/client/SessionImpl.h +++ b/cpp/src/qpid/client/SessionImpl.h @@ -22,9 +22,9 @@ #ifndef _SessionImpl_ #define _SessionImpl_ -#include "Demux.h" -#include "Execution.h" -#include "Results.h" +#include "qpid/client/Demux.h" +#include "qpid/client/Execution.h" +#include "qpid/client/Results.h" #include "qpid/SessionId.h" #include "qpid/SessionState.h" diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp index 7b0bcc6f1e..80c53770a0 100644 --- a/cpp/src/qpid/client/SslConnector.cpp +++ b/cpp/src/qpid/client/SslConnector.cpp @@ -18,12 +18,12 @@ * under the License. * */ -#include "Connector.h" +#include "qpid/client/Connector.h" #include "config.h" -#include "Bounds.h" -#include "ConnectionImpl.h" -#include "ConnectionSettings.h" +#include "qpid/client/Bounds.h" +#include "qpid/client/ConnectionImpl.h" +#include "qpid/client/ConnectionSettings.h" #include "qpid/Options.h" #include "qpid/log/Statement.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/client/StateManager.cpp b/cpp/src/qpid/client/StateManager.cpp index 0cb3c6b9d4..9239950a3f 100644 --- a/cpp/src/qpid/client/StateManager.cpp +++ b/cpp/src/qpid/client/StateManager.cpp @@ -19,7 +19,7 @@ * */ -#include "StateManager.h" +#include "qpid/client/StateManager.h" #include "qpid/framing/amqp_framing.h" using namespace qpid::client; diff --git a/cpp/src/qpid/client/Subscription.cpp b/cpp/src/qpid/client/Subscription.cpp index 23e45a270a..988f372604 100644 --- a/cpp/src/qpid/client/Subscription.cpp +++ b/cpp/src/qpid/client/Subscription.cpp @@ -19,10 +19,10 @@ * */ -#include "Subscription.h" -#include "SubscriptionImpl.h" -#include "CompletionImpl.h" -#include "PrivateImplRef.h" +#include "qpid/client/Subscription.h" +#include "qpid/client/SubscriptionImpl.h" +#include "qpid/client/CompletionImpl.h" +#include "qpid/client/PrivateImplRef.h" #include "qpid/framing/enum.h" namespace qpid { diff --git a/cpp/src/qpid/client/SubscriptionImpl.cpp b/cpp/src/qpid/client/SubscriptionImpl.cpp index c0f58ed4e7..a8a0b47d94 100644 --- a/cpp/src/qpid/client/SubscriptionImpl.cpp +++ b/cpp/src/qpid/client/SubscriptionImpl.cpp @@ -19,16 +19,16 @@ * */ -#include "AsyncSession.h" -#include "SubscriptionImpl.h" -#include "SessionImpl.h" -#include "SubscriptionManagerImpl.h" -#include "MessageImpl.h" -#include "CompletionImpl.h" -#include "SubscriptionManager.h" -#include "SubscriptionSettings.h" -#include "SessionBase_0_10Access.h" -#include "PrivateImplRef.h" +#include "qpid/client/AsyncSession.h" +#include "qpid/client/SubscriptionImpl.h" +#include "qpid/client/SessionImpl.h" +#include "qpid/client/SubscriptionManagerImpl.h" +#include "qpid/client/MessageImpl.h" +#include "qpid/client/CompletionImpl.h" +#include "qpid/client/SubscriptionManager.h" +#include "qpid/client/SubscriptionSettings.h" +#include "qpid/client/SessionBase_0_10Access.h" +#include "qpid/client/PrivateImplRef.h" namespace qpid { namespace client { diff --git a/cpp/src/qpid/client/SubscriptionManager.cpp b/cpp/src/qpid/client/SubscriptionManager.cpp index 07b34fc97f..7eac3c541b 100644 --- a/cpp/src/qpid/client/SubscriptionManager.cpp +++ b/cpp/src/qpid/client/SubscriptionManager.cpp @@ -19,9 +19,9 @@ * */ -#include "SubscriptionManager.h" -#include "SubscriptionManagerImpl.h" -#include "PrivateImplRef.h" +#include "qpid/client/SubscriptionManager.h" +#include "qpid/client/SubscriptionManagerImpl.h" +#include "qpid/client/PrivateImplRef.h" namespace qpid { diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp b/cpp/src/qpid/client/SubscriptionManagerImpl.cpp index 27b46c36f8..a558d90be8 100644 --- a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp +++ b/cpp/src/qpid/client/SubscriptionManagerImpl.cpp @@ -19,11 +19,11 @@ * */ -#include "SubscriptionManager.h" -#include "SubscriptionManagerImpl.h" -#include "SubscriptionImpl.h" -#include "LocalQueueImpl.h" -#include "PrivateImplRef.h" +#include "qpid/client/SubscriptionManager.h" +#include "qpid/client/SubscriptionManagerImpl.h" +#include "qpid/client/SubscriptionImpl.h" +#include "qpid/client/LocalQueueImpl.h" +#include "qpid/client/PrivateImplRef.h" #include <qpid/client/Dispatcher.h> #include <qpid/client/Session.h> #include <qpid/client/MessageListener.h> diff --git a/cpp/src/qpid/client/TypedResult.h b/cpp/src/qpid/client/TypedResult.h index bc4b65d23e..0eac96c9c3 100644 --- a/cpp/src/qpid/client/TypedResult.h +++ b/cpp/src/qpid/client/TypedResult.h @@ -22,7 +22,7 @@ #ifndef _TypedResult_ #define _TypedResult_ -#include "Completion.h" +#include "qpid/client/Completion.h" #include "qpid/framing/StructHelper.h" namespace qpid { diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 92859cc641..fc8faf08ec 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -84,13 +84,13 @@ * - Connection control events carrying non-cluster frames: frames sent to the client. * e.g. flow-control frames generated on a timer. */ -#include "Cluster.h" -#include "ClusterSettings.h" -#include "Connection.h" -#include "UpdateClient.h" -#include "RetractClient.h" -#include "FailoverExchange.h" -#include "UpdateExchange.h" +#include "qpid/cluster/Cluster.h" +#include "qpid/cluster/ClusterSettings.h" +#include "qpid/cluster/Connection.h" +#include "qpid/cluster/UpdateClient.h" +#include "qpid/cluster/RetractClient.h" +#include "qpid/cluster/FailoverExchange.h" +#include "qpid/cluster/UpdateExchange.h" #include "qpid/assert.h" #include "qmf/org/apache/qpid/cluster/ArgsClusterStopClusterNode.h" diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h index 170b465ff3..e83cf6a1e2 100644 --- a/cpp/src/qpid/cluster/Cluster.h +++ b/cpp/src/qpid/cluster/Cluster.h @@ -19,21 +19,21 @@ * */ -#include "ClusterMap.h" -#include "ClusterSettings.h" -#include "Cpg.h" -#include "Decoder.h" -#include "ErrorCheck.h" -#include "Event.h" -#include "EventFrame.h" -#include "ExpiryPolicy.h" -#include "FailoverExchange.h" -#include "LockedConnectionMap.h" -#include "Multicaster.h" -#include "NoOpConnectionOutputHandler.h" -#include "PollableQueue.h" -#include "PollerDispatch.h" -#include "Quorum.h" +#include "qpid/cluster/ClusterMap.h" +#include "qpid/cluster/ClusterSettings.h" +#include "qpid/cluster/Cpg.h" +#include "qpid/cluster/Decoder.h" +#include "qpid/cluster/ErrorCheck.h" +#include "qpid/cluster/Event.h" +#include "qpid/cluster/EventFrame.h" +#include "qpid/cluster/ExpiryPolicy.h" +#include "qpid/cluster/FailoverExchange.h" +#include "qpid/cluster/LockedConnectionMap.h" +#include "qpid/cluster/Multicaster.h" +#include "qpid/cluster/NoOpConnectionOutputHandler.h" +#include "qpid/cluster/PollableQueue.h" +#include "qpid/cluster/PollerDispatch.h" +#include "qpid/cluster/Quorum.h" #include "qmf/org/apache/qpid/cluster/Cluster.h" #include "qpid/Url.h" diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/cpp/src/qpid/cluster/ClusterMap.cpp index e8c421d4eb..e4e0e50fe3 100644 --- a/cpp/src/qpid/cluster/ClusterMap.cpp +++ b/cpp/src/qpid/cluster/ClusterMap.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "ClusterMap.h" +#include "qpid/cluster/ClusterMap.h" #include "qpid/Url.h" #include "qpid/framing/FieldTable.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/cluster/ClusterMap.h b/cpp/src/qpid/cluster/ClusterMap.h index 7e42ed1c19..1b891f73f0 100644 --- a/cpp/src/qpid/cluster/ClusterMap.h +++ b/cpp/src/qpid/cluster/ClusterMap.h @@ -22,7 +22,7 @@ * */ -#include "types.h" +#include "qpid/cluster/types.h" #include "qpid/Url.h" #include "qpid/framing/ClusterConnectionMembershipBody.h" diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp index 695bd8bfeb..935a84a7a9 100644 --- a/cpp/src/qpid/cluster/ClusterPlugin.cpp +++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp @@ -17,9 +17,9 @@ */ #include "config.h" -#include "Connection.h" -#include "ConnectionCodec.h" -#include "ClusterSettings.h" +#include "qpid/cluster/Connection.h" +#include "qpid/cluster/ConnectionCodec.h" +#include "qpid/cluster/ClusterSettings.h" #include "qpid/cluster/Cluster.h" #include "qpid/cluster/ConnectionCodec.h" diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp index c129ecbd65..15cd028e10 100644 --- a/cpp/src/qpid/cluster/Connection.cpp +++ b/cpp/src/qpid/cluster/Connection.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "Connection.h" -#include "UpdateClient.h" -#include "Cluster.h" +#include "qpid/cluster/Connection.h" +#include "qpid/cluster/UpdateClient.h" +#include "qpid/cluster/Cluster.h" #include "qpid/broker/SessionState.h" #include "qpid/broker/SemanticState.h" diff --git a/cpp/src/qpid/cluster/Connection.h b/cpp/src/qpid/cluster/Connection.h index 687b0585d3..ac2b6cd50c 100644 --- a/cpp/src/qpid/cluster/Connection.h +++ b/cpp/src/qpid/cluster/Connection.h @@ -22,10 +22,10 @@ * */ -#include "types.h" -#include "OutputInterceptor.h" -#include "EventFrame.h" -#include "McastFrameHandler.h" +#include "qpid/cluster/types.h" +#include "qpid/cluster/OutputInterceptor.h" +#include "qpid/cluster/EventFrame.h" +#include "qpid/cluster/McastFrameHandler.h" #include "qpid/broker/Connection.h" #include "qpid/amqp_0_10/Connection.h" diff --git a/cpp/src/qpid/cluster/ConnectionCodec.cpp b/cpp/src/qpid/cluster/ConnectionCodec.cpp index 007337792b..0c791cdf44 100644 --- a/cpp/src/qpid/cluster/ConnectionCodec.cpp +++ b/cpp/src/qpid/cluster/ConnectionCodec.cpp @@ -18,10 +18,10 @@ * under the License. * */ -#include "ConnectionCodec.h" -#include "Connection.h" -#include "Cluster.h" -#include "ProxyInputHandler.h" +#include "qpid/cluster/ConnectionCodec.h" +#include "qpid/cluster/Connection.h" +#include "qpid/cluster/Cluster.h" +#include "qpid/cluster/ProxyInputHandler.h" #include "qpid/broker/Connection.h" #include "qpid/framing/ConnectionCloseBody.h" #include "qpid/framing/ConnectionCloseOkBody.h" diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/cpp/src/qpid/cluster/Cpg.cpp index 6d9799a0a5..f5e79012d9 100644 --- a/cpp/src/qpid/cluster/Cpg.cpp +++ b/cpp/src/qpid/cluster/Cpg.cpp @@ -16,7 +16,7 @@ * */ -#include "Cpg.h" +#include "qpid/cluster/Cpg.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Time.h" #include "qpid/sys/posix/PrivatePosix.h" diff --git a/cpp/src/qpid/cluster/Decoder.cpp b/cpp/src/qpid/cluster/Decoder.cpp index a57edb3b7f..23ba372d78 100644 --- a/cpp/src/qpid/cluster/Decoder.cpp +++ b/cpp/src/qpid/cluster/Decoder.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "Decoder.h" -#include "EventFrame.h" +#include "qpid/cluster/Decoder.h" +#include "qpid/cluster/EventFrame.h" #include "qpid/framing/ClusterConnectionDeliverCloseBody.h" #include "qpid/framing/Buffer.h" #include "qpid/framing/AMQFrame.h" diff --git a/cpp/src/qpid/cluster/Decoder.h b/cpp/src/qpid/cluster/Decoder.h index 6bcd877a75..2e2af2868f 100644 --- a/cpp/src/qpid/cluster/Decoder.h +++ b/cpp/src/qpid/cluster/Decoder.h @@ -22,7 +22,7 @@ * */ -#include "types.h" +#include "qpid/cluster/types.h" #include "qpid/framing/FrameDecoder.h" #include "qpid/sys/Mutex.h" #include <boost/function.hpp> diff --git a/cpp/src/qpid/cluster/ErrorCheck.cpp b/cpp/src/qpid/cluster/ErrorCheck.cpp index c22ed17239..2af820c8a0 100644 --- a/cpp/src/qpid/cluster/ErrorCheck.cpp +++ b/cpp/src/qpid/cluster/ErrorCheck.cpp @@ -18,10 +18,10 @@ * under the License. * */ -#include "ErrorCheck.h" -#include "EventFrame.h" -#include "ClusterMap.h" -#include "Cluster.h" +#include "qpid/cluster/ErrorCheck.h" +#include "qpid/cluster/EventFrame.h" +#include "qpid/cluster/ClusterMap.h" +#include "qpid/cluster/Cluster.h" #include "qpid/framing/ClusterErrorCheckBody.h" #include "qpid/framing/ClusterConfigChangeBody.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/cluster/ErrorCheck.h b/cpp/src/qpid/cluster/ErrorCheck.h index 236b820116..51312046b8 100644 --- a/cpp/src/qpid/cluster/ErrorCheck.h +++ b/cpp/src/qpid/cluster/ErrorCheck.h @@ -22,8 +22,8 @@ * */ -#include "types.h" -#include "Multicaster.h" +#include "qpid/cluster/types.h" +#include "qpid/cluster/Multicaster.h" #include "qpid/framing/enum.h" #include <boost/function.hpp> #include <deque> diff --git a/cpp/src/qpid/cluster/Event.cpp b/cpp/src/qpid/cluster/Event.cpp index ae62994e88..30866d3154 100644 --- a/cpp/src/qpid/cluster/Event.cpp +++ b/cpp/src/qpid/cluster/Event.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "types.h" -#include "Event.h" -#include "Cpg.h" +#include "qpid/cluster/types.h" +#include "qpid/cluster/Event.h" +#include "qpid/cluster/Cpg.h" #include "qpid/framing/Buffer.h" #include "qpid/framing/AMQFrame.h" #include "qpid/assert.h" diff --git a/cpp/src/qpid/cluster/Event.h b/cpp/src/qpid/cluster/Event.h index 3175dd9ed2..07f74d3ba5 100644 --- a/cpp/src/qpid/cluster/Event.h +++ b/cpp/src/qpid/cluster/Event.h @@ -22,13 +22,13 @@ * */ -#include "types.h" +#include "qpid/cluster/types.h" #include "qpid/RefCountedBuffer.h" #include "qpid/framing/AMQFrame.h" #include <sys/uio.h> // For iovec #include <iosfwd> -#include "types.h" +#include "qpid/cluster/types.h" namespace qpid { diff --git a/cpp/src/qpid/cluster/EventFrame.cpp b/cpp/src/qpid/cluster/EventFrame.cpp index a48d134f1b..5fbe1fe57c 100644 --- a/cpp/src/qpid/cluster/EventFrame.cpp +++ b/cpp/src/qpid/cluster/EventFrame.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "EventFrame.h" -#include "Connection.h" +#include "qpid/cluster/EventFrame.h" +#include "qpid/cluster/Connection.h" namespace qpid { namespace cluster { diff --git a/cpp/src/qpid/cluster/EventFrame.h b/cpp/src/qpid/cluster/EventFrame.h index e275aac7aa..61447c5525 100644 --- a/cpp/src/qpid/cluster/EventFrame.h +++ b/cpp/src/qpid/cluster/EventFrame.h @@ -22,8 +22,8 @@ * */ -#include "types.h" -#include "Event.h" +#include "qpid/cluster/types.h" +#include "qpid/cluster/Event.h" #include "qpid/framing/AMQFrame.h" #include <boost/intrusive_ptr.hpp> #include <iosfwd> diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp index 348963f901..717e1a47cd 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp +++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp @@ -19,8 +19,8 @@ * */ -#include "ExpiryPolicy.h" -#include "Multicaster.h" +#include "qpid/cluster/ExpiryPolicy.h" +#include "qpid/cluster/Multicaster.h" #include "qpid/framing/ClusterMessageExpiredBody.h" #include "qpid/sys/Time.h" #include "qpid/broker/Message.h" diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.h b/cpp/src/qpid/cluster/ExpiryPolicy.h index c147e54796..4ec41c93bc 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.h +++ b/cpp/src/qpid/cluster/ExpiryPolicy.h @@ -22,7 +22,7 @@ * */ -#include "types.h" +#include "qpid/cluster/types.h" #include "qpid/broker/ExpiryPolicy.h" #include "qpid/sys/Mutex.h" #include <boost/function.hpp> diff --git a/cpp/src/qpid/cluster/FailoverExchange.cpp b/cpp/src/qpid/cluster/FailoverExchange.cpp index e438d958ea..e01c41494b 100644 --- a/cpp/src/qpid/cluster/FailoverExchange.cpp +++ b/cpp/src/qpid/cluster/FailoverExchange.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "FailoverExchange.h" +#include "qpid/cluster/FailoverExchange.h" #include "qpid/broker/Message.h" #include "qpid/broker/DeliverableMessage.h" #include "qpid/broker/Queue.h" diff --git a/cpp/src/qpid/cluster/LockedConnectionMap.h b/cpp/src/qpid/cluster/LockedConnectionMap.h index f4f1d7e832..ac744d4f94 100644 --- a/cpp/src/qpid/cluster/LockedConnectionMap.h +++ b/cpp/src/qpid/cluster/LockedConnectionMap.h @@ -22,9 +22,9 @@ * */ -#include "types.h" +#include "qpid/cluster/types.h" #include "qpid/sys/Mutex.h" -#include "Connection.h" +#include "qpid/cluster/Connection.h" namespace qpid { namespace cluster { diff --git a/cpp/src/qpid/cluster/McastFrameHandler.h b/cpp/src/qpid/cluster/McastFrameHandler.h index 5127c31c84..17e4c2e9f0 100644 --- a/cpp/src/qpid/cluster/McastFrameHandler.h +++ b/cpp/src/qpid/cluster/McastFrameHandler.h @@ -22,8 +22,8 @@ * */ -#include "types.h" -#include "Multicaster.h" +#include "qpid/cluster/types.h" +#include "qpid/cluster/Multicaster.h" #include "qpid/framing/FrameHandler.h" namespace qpid { diff --git a/cpp/src/qpid/cluster/Multicaster.cpp b/cpp/src/qpid/cluster/Multicaster.cpp index 4d02d58efe..7e97963318 100644 --- a/cpp/src/qpid/cluster/Multicaster.cpp +++ b/cpp/src/qpid/cluster/Multicaster.cpp @@ -19,8 +19,8 @@ * */ -#include "Multicaster.h" -#include "Cpg.h" +#include "qpid/cluster/Multicaster.h" +#include "qpid/cluster/Cpg.h" #include "qpid/log/Statement.h" #include "qpid/framing/AMQBody.h" #include "qpid/framing/AMQFrame.h" diff --git a/cpp/src/qpid/cluster/Multicaster.h b/cpp/src/qpid/cluster/Multicaster.h index 1566c66a75..f2ee5099bb 100644 --- a/cpp/src/qpid/cluster/Multicaster.h +++ b/cpp/src/qpid/cluster/Multicaster.h @@ -22,8 +22,8 @@ * */ -#include "types.h" -#include "Event.h" +#include "qpid/cluster/types.h" +#include "qpid/cluster/Event.h" #include "qpid/sys/PollableQueue.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/LatencyTracker.h" diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/cpp/src/qpid/cluster/OutputInterceptor.cpp index 3c3c330787..2025c664da 100644 --- a/cpp/src/qpid/cluster/OutputInterceptor.cpp +++ b/cpp/src/qpid/cluster/OutputInterceptor.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "OutputInterceptor.h" -#include "Connection.h" -#include "Cluster.h" +#include "qpid/cluster/OutputInterceptor.h" +#include "qpid/cluster/Connection.h" +#include "qpid/cluster/Cluster.h" #include "qpid/framing/ClusterConnectionDeliverDoOutputBody.h" #include "qpid/framing/AMQFrame.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/cluster/OutputInterceptor.h b/cpp/src/qpid/cluster/OutputInterceptor.h index 62b7d6567f..65bd82a4fc 100644 --- a/cpp/src/qpid/cluster/OutputInterceptor.h +++ b/cpp/src/qpid/cluster/OutputInterceptor.h @@ -22,7 +22,7 @@ * */ -#include "NoOpConnectionOutputHandler.h" +#include "qpid/cluster/NoOpConnectionOutputHandler.h" #include "qpid/sys/ConnectionOutputHandler.h" #include "qpid/sys/Mutex.h" #include "qpid/broker/ConnectionFactory.h" diff --git a/cpp/src/qpid/cluster/PollerDispatch.cpp b/cpp/src/qpid/cluster/PollerDispatch.cpp index c8e28c0d51..47c1fd0c39 100644 --- a/cpp/src/qpid/cluster/PollerDispatch.cpp +++ b/cpp/src/qpid/cluster/PollerDispatch.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "PollerDispatch.h" +#include "qpid/cluster/PollerDispatch.h" #include "qpid/log/Statement.h" #include <boost/bind.hpp> diff --git a/cpp/src/qpid/cluster/PollerDispatch.h b/cpp/src/qpid/cluster/PollerDispatch.h index 52137b72a8..1c9266aa3c 100644 --- a/cpp/src/qpid/cluster/PollerDispatch.h +++ b/cpp/src/qpid/cluster/PollerDispatch.h @@ -22,7 +22,7 @@ * */ -#include "Cpg.h" +#include "qpid/cluster/Cpg.h" #include "qpid/sys/Poller.h" #include "qpid/sys/DispatchHandle.h" #include <boost/function.hpp> diff --git a/cpp/src/qpid/cluster/Quorum.h b/cpp/src/qpid/cluster/Quorum.h index ea55c36730..bbfa473f94 100644 --- a/cpp/src/qpid/cluster/Quorum.h +++ b/cpp/src/qpid/cluster/Quorum.h @@ -24,9 +24,9 @@ #include "config.h" #if HAVE_LIBCMAN_H -#include "Quorum_cman.h" +#include "qpid/cluster/Quorum_cman.h" #else -#include "Quorum_null.h" +#include "qpid/cluster/Quorum_null.h" #endif #endif /*!QPID_CLUSTER_QUORUM_H*/ diff --git a/cpp/src/qpid/cluster/Quorum_cman.cpp b/cpp/src/qpid/cluster/Quorum_cman.cpp index f301f4c877..0bf29f8042 100644 --- a/cpp/src/qpid/cluster/Quorum_cman.cpp +++ b/cpp/src/qpid/cluster/Quorum_cman.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Quorum_cman.h" +#include "qpid/cluster/Quorum_cman.h" #include "qpid/log/Statement.h" #include "qpid/Options.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/cluster/RetractClient.cpp b/cpp/src/qpid/cluster/RetractClient.cpp index dfca7fdef4..7d9f52fc39 100644 --- a/cpp/src/qpid/cluster/RetractClient.cpp +++ b/cpp/src/qpid/cluster/RetractClient.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "RetractClient.h" -#include "UpdateClient.h" +#include "qpid/cluster/RetractClient.h" +#include "qpid/cluster/UpdateClient.h" #include "qpid/framing/ClusterConnectionRetractOfferBody.h" #include "qpid/client/ConnectionAccess.h" #include "qpid/client/ConnectionImpl.h" diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/cpp/src/qpid/cluster/UpdateClient.cpp index a8ab105395..1e9af4a589 100644 --- a/cpp/src/qpid/cluster/UpdateClient.cpp +++ b/cpp/src/qpid/cluster/UpdateClient.cpp @@ -18,12 +18,12 @@ * under the License. * */ -#include "UpdateClient.h" -#include "Cluster.h" -#include "ClusterMap.h" -#include "Connection.h" -#include "Decoder.h" -#include "ExpiryPolicy.h" +#include "qpid/cluster/UpdateClient.h" +#include "qpid/cluster/Cluster.h" +#include "qpid/cluster/ClusterMap.h" +#include "qpid/cluster/Connection.h" +#include "qpid/cluster/Decoder.h" +#include "qpid/cluster/ExpiryPolicy.h" #include "qpid/client/SessionBase_0_10Access.h" #include "qpid/client/ConnectionAccess.h" #include "qpid/client/SessionImpl.h" diff --git a/cpp/src/qpid/cluster/UpdateClient.h b/cpp/src/qpid/cluster/UpdateClient.h index fd3d37ae5f..4970026547 100644 --- a/cpp/src/qpid/cluster/UpdateClient.h +++ b/cpp/src/qpid/cluster/UpdateClient.h @@ -22,7 +22,7 @@ * */ -#include "ClusterMap.h" +#include "qpid/cluster/ClusterMap.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionSettings.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/qpid/cluster/UpdateExchange.h b/cpp/src/qpid/cluster/UpdateExchange.h index 7a4a484c8a..194a3d386d 100644 --- a/cpp/src/qpid/cluster/UpdateExchange.h +++ b/cpp/src/qpid/cluster/UpdateExchange.h @@ -22,7 +22,7 @@ * */ -#include "UpdateClient.h" +#include "qpid/cluster/UpdateClient.h" #include "qpid/broker/FanOutExchange.h" diff --git a/cpp/src/qpid/console/Agent.cpp b/cpp/src/qpid/console/Agent.cpp index 8b5a8adbb4..fa76a13583 100644 --- a/cpp/src/qpid/console/Agent.cpp +++ b/cpp/src/qpid/console/Agent.cpp @@ -19,7 +19,7 @@ * */ -#include "Agent.h" +#include "qpid/console/Agent.h" std::ostream& qpid::console::operator<<(std::ostream& o, const Agent& agent) { diff --git a/cpp/src/qpid/console/Agent.h b/cpp/src/qpid/console/Agent.h index 884d4c92bd..e9cd2abc22 100644 --- a/cpp/src/qpid/console/Agent.h +++ b/cpp/src/qpid/console/Agent.h @@ -21,8 +21,8 @@ #ifndef _QPID_CONSOLE_AGENT_H_ #define _QPID_CONSOLE_AGENT_H_ -#include "Broker.h" -#include "ConsoleImportExport.h" +#include "qpid/console/Broker.h" +#include "qpid/console/ConsoleImportExport.h" namespace qpid { namespace console { diff --git a/cpp/src/qpid/console/Broker.cpp b/cpp/src/qpid/console/Broker.cpp index 68279a4f8e..53776c1a12 100644 --- a/cpp/src/qpid/console/Broker.cpp +++ b/cpp/src/qpid/console/Broker.cpp @@ -19,11 +19,11 @@ * */ -#include "Broker.h" -#include "Object.h" -#include "Value.h" -#include "SessionManager.h" -#include "ConsoleListener.h" +#include "qpid/console/Broker.h" +#include "qpid/console/Object.h" +#include "qpid/console/Value.h" +#include "qpid/console/SessionManager.h" +#include "qpid/console/ConsoleListener.h" #include "qpid/log/Statement.h" #include "qpid/sys/SystemInfo.h" diff --git a/cpp/src/qpid/console/Broker.h b/cpp/src/qpid/console/Broker.h index dc85d45d62..6aebdf0493 100644 --- a/cpp/src/qpid/console/Broker.h +++ b/cpp/src/qpid/console/Broker.h @@ -21,7 +21,7 @@ #ifndef _QPID_CONSOLE_BROKER_H_ #define _QPID_CONSOLE_BROKER_H_ -#include "ConsoleImportExport.h" +#include "qpid/console/ConsoleImportExport.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionSettings.h" #include "qpid/client/SubscriptionManager.h" diff --git a/cpp/src/qpid/console/ClassKey.cpp b/cpp/src/qpid/console/ClassKey.cpp index b97eb3ca44..7a16113bae 100644 --- a/cpp/src/qpid/console/ClassKey.cpp +++ b/cpp/src/qpid/console/ClassKey.cpp @@ -19,7 +19,7 @@ * */ -#include "ClassKey.h" +#include "qpid/console/ClassKey.h" #include <string.h> #include <cstdio> diff --git a/cpp/src/qpid/console/ClassKey.h b/cpp/src/qpid/console/ClassKey.h index 821b01c4ef..bfbcb6a059 100644 --- a/cpp/src/qpid/console/ClassKey.h +++ b/cpp/src/qpid/console/ClassKey.h @@ -22,8 +22,8 @@ #define _QPID_CONSOLE_CLASSKEY_H_ #include <string> -#include "ConsoleImportExport.h" -#include "Package.h" +#include "qpid/console/ConsoleImportExport.h" +#include "qpid/console/Package.h" #include "qpid/framing/Buffer.h" namespace qpid { diff --git a/cpp/src/qpid/console/ConsoleListener.h b/cpp/src/qpid/console/ConsoleListener.h index d661c63120..bd87390e99 100644 --- a/cpp/src/qpid/console/ConsoleListener.h +++ b/cpp/src/qpid/console/ConsoleListener.h @@ -22,11 +22,11 @@ #define _QPID_CONSOLE_CONSOLE_LISTENER_H_ #include <string> -#include "ConsoleImportExport.h" -#include "Broker.h" -#include "ClassKey.h" -#include "Object.h" -#include "Event.h" +#include "qpid/console/ConsoleImportExport.h" +#include "qpid/console/Broker.h" +#include "qpid/console/ClassKey.h" +#include "qpid/console/Object.h" +#include "qpid/console/Event.h" namespace qpid { namespace console { diff --git a/cpp/src/qpid/console/Event.cpp b/cpp/src/qpid/console/Event.cpp index 7d6f5764a2..3e14804b35 100644 --- a/cpp/src/qpid/console/Event.cpp +++ b/cpp/src/qpid/console/Event.cpp @@ -19,11 +19,11 @@ * */ -#include "Broker.h" -#include "ClassKey.h" -#include "Schema.h" -#include "Event.h" -#include "Value.h" +#include "qpid/console/Broker.h" +#include "qpid/console/ClassKey.h" +#include "qpid/console/Schema.h" +#include "qpid/console/Event.h" +#include "qpid/console/Value.h" #include "qpid/sys/Time.h" #include "qpid/framing/Buffer.h" diff --git a/cpp/src/qpid/console/Event.h b/cpp/src/qpid/console/Event.h index 4d51708965..475898a1bc 100644 --- a/cpp/src/qpid/console/Event.h +++ b/cpp/src/qpid/console/Event.h @@ -21,8 +21,8 @@ #ifndef _QPID_CONSOLE_EVENT_H_ #define _QPID_CONSOLE_EVENT_H_ -#include "ConsoleImportExport.h" -#include "Object.h" +#include "qpid/console/ConsoleImportExport.h" +#include "qpid/console/Object.h" #include "qpid/framing/Uuid.h" #include "qpid/framing/FieldTable.h" diff --git a/cpp/src/qpid/console/Object.cpp b/cpp/src/qpid/console/Object.cpp index 9d04c074ea..6570e293ab 100644 --- a/cpp/src/qpid/console/Object.cpp +++ b/cpp/src/qpid/console/Object.cpp @@ -19,12 +19,12 @@ * */ -#include "SessionManager.h" -#include "Broker.h" -#include "Object.h" -#include "Schema.h" -#include "ClassKey.h" -#include "Value.h" +#include "qpid/console/SessionManager.h" +#include "qpid/console/Broker.h" +#include "qpid/console/Object.h" +#include "qpid/console/Schema.h" +#include "qpid/console/ClassKey.h" +#include "qpid/console/Value.h" #include "qpid/framing/Buffer.h" #include "qpid/sys/Mutex.h" diff --git a/cpp/src/qpid/console/Object.h b/cpp/src/qpid/console/Object.h index d2fb09ecca..38f4f0fc5e 100644 --- a/cpp/src/qpid/console/Object.h +++ b/cpp/src/qpid/console/Object.h @@ -21,8 +21,8 @@ #ifndef _QPID_CONSOLE_OBJECT_H_ #define _QPID_CONSOLE_OBJECT_H_ -#include "ConsoleImportExport.h" -#include "ObjectId.h" +#include "qpid/console/ConsoleImportExport.h" +#include "qpid/console/ObjectId.h" #include "qpid/framing/Uuid.h" #include "qpid/framing/FieldTable.h" #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/console/ObjectId.cpp b/cpp/src/qpid/console/ObjectId.cpp index f8993e7e05..fbaad20d57 100644 --- a/cpp/src/qpid/console/ObjectId.cpp +++ b/cpp/src/qpid/console/ObjectId.cpp @@ -19,7 +19,7 @@ * */ -#include "ObjectId.h" +#include "qpid/console/ObjectId.h" #include "qpid/framing/Buffer.h" using namespace qpid::console; diff --git a/cpp/src/qpid/console/ObjectId.h b/cpp/src/qpid/console/ObjectId.h index ac0e8d8b03..df5098288d 100644 --- a/cpp/src/qpid/console/ObjectId.h +++ b/cpp/src/qpid/console/ObjectId.h @@ -22,7 +22,7 @@ #define _QPID_CONSOLE_OBJECTID_H #include <iostream> -#include "ConsoleImportExport.h" +#include "qpid/console/ConsoleImportExport.h" #include "qpid/sys/IntegerTypes.h" namespace qpid { diff --git a/cpp/src/qpid/console/Package.cpp b/cpp/src/qpid/console/Package.cpp index 81a04445f2..e5d6fa29fd 100644 --- a/cpp/src/qpid/console/Package.cpp +++ b/cpp/src/qpid/console/Package.cpp @@ -19,7 +19,7 @@ * */ -#include "Package.h" +#include "qpid/console/Package.h" using namespace qpid::console; diff --git a/cpp/src/qpid/console/Package.h b/cpp/src/qpid/console/Package.h index 3cc63c8b75..62356a71da 100644 --- a/cpp/src/qpid/console/Package.h +++ b/cpp/src/qpid/console/Package.h @@ -23,7 +23,7 @@ #include <string> #include <map> -#include "ConsoleImportExport.h" +#include "qpid/console/ConsoleImportExport.h" #include "qpid/sys/IntegerTypes.h" namespace qpid { diff --git a/cpp/src/qpid/console/Schema.cpp b/cpp/src/qpid/console/Schema.cpp index a248b2d09a..7efdc63ef0 100644 --- a/cpp/src/qpid/console/Schema.cpp +++ b/cpp/src/qpid/console/Schema.cpp @@ -19,8 +19,8 @@ * */ -#include "Schema.h" -#include "Value.h" +#include "qpid/console/Schema.h" +#include "qpid/console/Value.h" #include "qpid/framing/FieldTable.h" using namespace qpid::console; diff --git a/cpp/src/qpid/console/Schema.h b/cpp/src/qpid/console/Schema.h index aacedfe23f..b167de1f45 100644 --- a/cpp/src/qpid/console/Schema.h +++ b/cpp/src/qpid/console/Schema.h @@ -21,7 +21,7 @@ #ifndef _QPID_CONSOLE_SCHEMA_H_ #define _QPID_CONSOLE_SCHEMA_H_ -#include "ClassKey.h" +#include "qpid/console/ClassKey.h" #include <boost/shared_ptr.hpp> #include <vector> diff --git a/cpp/src/qpid/console/SequenceManager.cpp b/cpp/src/qpid/console/SequenceManager.cpp index ff777430c0..86ea829749 100644 --- a/cpp/src/qpid/console/SequenceManager.cpp +++ b/cpp/src/qpid/console/SequenceManager.cpp @@ -19,7 +19,7 @@ * */ -#include "SequenceManager.h" +#include "qpid/console/SequenceManager.h" using namespace qpid::console; using namespace qpid::sys; diff --git a/cpp/src/qpid/console/SequenceManager.h b/cpp/src/qpid/console/SequenceManager.h index 5a041f530b..181120dd7b 100644 --- a/cpp/src/qpid/console/SequenceManager.h +++ b/cpp/src/qpid/console/SequenceManager.h @@ -21,7 +21,7 @@ #ifndef _QPID_CONSOLE_SEQUENCEMANAGER_H_ #define _QPID_CONSOLE_SEQUENCEMANAGER_H_ -#include "ConsoleImportExport.h" +#include "qpid/console/ConsoleImportExport.h" #include "qpid/sys/Mutex.h" #include <map> #include <string> diff --git a/cpp/src/qpid/console/SessionManager.cpp b/cpp/src/qpid/console/SessionManager.cpp index 6cba0933e2..0285c5f34a 100644 --- a/cpp/src/qpid/console/SessionManager.cpp +++ b/cpp/src/qpid/console/SessionManager.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "SessionManager.h" -#include "Schema.h" -#include "Agent.h" +#include "qpid/console/SessionManager.h" +#include "qpid/console/Schema.h" +#include "qpid/console/Agent.h" #include "qpid/console/ConsoleListener.h" #include "qpid/log/Statement.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/console/SessionManager.h b/cpp/src/qpid/console/SessionManager.h index bbb4983bce..51b6aa69d1 100644 --- a/cpp/src/qpid/console/SessionManager.h +++ b/cpp/src/qpid/console/SessionManager.h @@ -22,16 +22,16 @@ * */ -#include "ConsoleImportExport.h" -#include "Broker.h" -#include "Package.h" -#include "SequenceManager.h" -#include "ClassKey.h" -#include "Schema.h" -#include "Agent.h" -#include "Object.h" -#include "ObjectId.h" -#include "Value.h" +#include "qpid/console/ConsoleImportExport.h" +#include "qpid/console/Broker.h" +#include "qpid/console/Package.h" +#include "qpid/console/SequenceManager.h" +#include "qpid/console/ClassKey.h" +#include "qpid/console/Schema.h" +#include "qpid/console/Agent.h" +#include "qpid/console/Object.h" +#include "qpid/console/ObjectId.h" +#include "qpid/console/Value.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Condition.h" #include "qpid/client/ConnectionSettings.h" diff --git a/cpp/src/qpid/console/Value.cpp b/cpp/src/qpid/console/Value.cpp index c557699f33..799892606a 100644 --- a/cpp/src/qpid/console/Value.cpp +++ b/cpp/src/qpid/console/Value.cpp @@ -19,7 +19,7 @@ * */ -#include "Value.h" +#include "qpid/console/Value.h" #include "qpid/framing/Buffer.h" using namespace qpid; diff --git a/cpp/src/qpid/console/Value.h b/cpp/src/qpid/console/Value.h index fbbe0b6a58..8769ae3d77 100644 --- a/cpp/src/qpid/console/Value.h +++ b/cpp/src/qpid/console/Value.h @@ -24,7 +24,7 @@ #include "qpid/Exception.h" #include "qpid/framing/Uuid.h" #include "qpid/framing/FieldTable.h" -#include "ObjectId.h" +#include "qpid/console/ObjectId.h" #include <boost/shared_ptr.hpp> namespace qpid { diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/cpp/src/qpid/framing/AMQContentBody.cpp index 85fb95739b..d0ae9a2902 100644 --- a/cpp/src/qpid/framing/AMQContentBody.cpp +++ b/cpp/src/qpid/framing/AMQContentBody.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "AMQContentBody.h" +#include "qpid/framing/AMQContentBody.h" #include <iostream> qpid::framing::AMQContentBody::AMQContentBody(){ diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/cpp/src/qpid/framing/AMQContentBody.h index 9606ae5ec5..69813b221c 100644 --- a/cpp/src/qpid/framing/AMQContentBody.h +++ b/cpp/src/qpid/framing/AMQContentBody.h @@ -18,9 +18,9 @@ * under the License. * */ -#include "amqp_types.h" -#include "AMQBody.h" -#include "Buffer.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/AMQBody.h" +#include "qpid/framing/Buffer.h" #include "qpid/CommonImportExport.h" #ifndef _AMQContentBody_ diff --git a/cpp/src/qpid/framing/AMQDataBlock.h b/cpp/src/qpid/framing/AMQDataBlock.h index 0b1f459627..7f0d0dc2b5 100644 --- a/cpp/src/qpid/framing/AMQDataBlock.h +++ b/cpp/src/qpid/framing/AMQDataBlock.h @@ -18,7 +18,7 @@ * under the License. * */ -#include "Buffer.h" +#include "qpid/framing/Buffer.h" #ifndef _AMQDataBlock_ #define _AMQDataBlock_ diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/cpp/src/qpid/framing/AMQFrame.cpp index 9473b2a513..76bf901bf4 100644 --- a/cpp/src/qpid/framing/AMQFrame.cpp +++ b/cpp/src/qpid/framing/AMQFrame.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "AMQFrame.h" +#include "qpid/framing/AMQFrame.h" #include "qpid/framing/AMQMethodBody.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h index 2f0a01d6ca..cae506fc06 100644 --- a/cpp/src/qpid/framing/AMQFrame.h +++ b/cpp/src/qpid/framing/AMQFrame.h @@ -21,11 +21,11 @@ * under the License. * */ -#include "AMQDataBlock.h" -#include "AMQHeaderBody.h" -#include "AMQContentBody.h" -#include "AMQHeartbeatBody.h" -#include "ProtocolVersion.h" +#include "qpid/framing/AMQDataBlock.h" +#include "qpid/framing/AMQHeaderBody.h" +#include "qpid/framing/AMQContentBody.h" +#include "qpid/framing/AMQHeartbeatBody.h" +#include "qpid/framing/ProtocolVersion.h" #include <boost/intrusive_ptr.hpp> #include <boost/cast.hpp> #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/cpp/src/qpid/framing/AMQHeaderBody.cpp index 276418b208..14218f1b45 100644 --- a/cpp/src/qpid/framing/AMQHeaderBody.cpp +++ b/cpp/src/qpid/framing/AMQHeaderBody.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "AMQHeaderBody.h" +#include "qpid/framing/AMQHeaderBody.h" #include "qpid/Exception.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/cpp/src/qpid/framing/AMQHeaderBody.h index 8c72683b1a..8d96e35720 100644 --- a/cpp/src/qpid/framing/AMQHeaderBody.h +++ b/cpp/src/qpid/framing/AMQHeaderBody.h @@ -21,9 +21,9 @@ * under the License. * */ -#include "amqp_types.h" -#include "AMQBody.h" -#include "Buffer.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/AMQBody.h" +#include "qpid/framing/Buffer.h" #include "qpid/framing/DeliveryProperties.h" #include "qpid/framing/MessageProperties.h" #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp b/cpp/src/qpid/framing/AMQHeartbeatBody.cpp index 140ce2e794..477616221c 100644 --- a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp +++ b/cpp/src/qpid/framing/AMQHeartbeatBody.cpp @@ -19,7 +19,7 @@ * */ -#include "AMQHeartbeatBody.h" +#include "qpid/framing/AMQHeartbeatBody.h" #include <iostream> qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {} diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/cpp/src/qpid/framing/AMQHeartbeatBody.h index 5d3f633576..9b1fe8a4c1 100644 --- a/cpp/src/qpid/framing/AMQHeartbeatBody.h +++ b/cpp/src/qpid/framing/AMQHeartbeatBody.h @@ -18,9 +18,9 @@ * under the License. * */ -#include "amqp_types.h" -#include "AMQBody.h" -#include "Buffer.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/AMQBody.h" +#include "qpid/framing/Buffer.h" #include "qpid/CommonImportExport.h" #ifndef _AMQHeartbeatBody_ diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/cpp/src/qpid/framing/AMQMethodBody.cpp index 924d906d43..594af4c6dc 100644 --- a/cpp/src/qpid/framing/AMQMethodBody.cpp +++ b/cpp/src/qpid/framing/AMQMethodBody.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "AMQMethodBody.h" +#include "qpid/framing/AMQMethodBody.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/cpp/src/qpid/framing/AMQMethodBody.h index c7e8931835..c634180712 100644 --- a/cpp/src/qpid/framing/AMQMethodBody.h +++ b/cpp/src/qpid/framing/AMQMethodBody.h @@ -21,8 +21,8 @@ * under the License. * */ -#include "amqp_types.h" -#include "AMQBody.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/AMQBody.h" #include "qpid/framing/ProtocolVersion.h" #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/AccumulatedAck.cpp b/cpp/src/qpid/framing/AccumulatedAck.cpp index 2d3ecf3f6a..2e6433a82f 100644 --- a/cpp/src/qpid/framing/AccumulatedAck.cpp +++ b/cpp/src/qpid/framing/AccumulatedAck.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "AccumulatedAck.h" +#include "qpid/framing/AccumulatedAck.h" #include <assert.h> #include <iostream> diff --git a/cpp/src/qpid/framing/AccumulatedAck.h b/cpp/src/qpid/framing/AccumulatedAck.h index ede73897c7..8e241b4ba1 100644 --- a/cpp/src/qpid/framing/AccumulatedAck.h +++ b/cpp/src/qpid/framing/AccumulatedAck.h @@ -25,8 +25,8 @@ #include <functional> #include <list> #include <ostream> -#include "SequenceNumber.h" -#include "SequenceNumberSet.h" +#include "qpid/framing/SequenceNumber.h" +#include "qpid/framing/SequenceNumberSet.h" #include "qpid/CommonImportExport.h" namespace qpid { diff --git a/cpp/src/qpid/framing/Array.cpp b/cpp/src/qpid/framing/Array.cpp index a4eb5a29ab..d95e0d167d 100644 --- a/cpp/src/qpid/framing/Array.cpp +++ b/cpp/src/qpid/framing/Array.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "Array.h" -#include "Buffer.h" -#include "FieldValue.h" +#include "qpid/framing/Array.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/FieldValue.h" #include "qpid/Exception.h" #include "qpid/framing/reply_exceptions.h" #include <assert.h> diff --git a/cpp/src/qpid/framing/Array.h b/cpp/src/qpid/framing/Array.h index 0b6b704ed2..f243307084 100644 --- a/cpp/src/qpid/framing/Array.h +++ b/cpp/src/qpid/framing/Array.h @@ -18,8 +18,8 @@ * under the License. * */ -#include "amqp_types.h" -#include "FieldValue.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/FieldValue.h" #include "qpid/framing/TypeCode.h" #include <boost/shared_ptr.hpp> #include <iostream> diff --git a/cpp/src/qpid/framing/Blob.cpp b/cpp/src/qpid/framing/Blob.cpp index 388d4b64ef..0c8316f3d2 100644 --- a/cpp/src/qpid/framing/Blob.cpp +++ b/cpp/src/qpid/framing/Blob.cpp @@ -18,7 +18,7 @@ * */ -#include "Blob.h" +#include "qpid/framing/Blob.h" namespace qpid { diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp index ffbcf33a95..e2128596ed 100644 --- a/cpp/src/qpid/framing/BodyHandler.cpp +++ b/cpp/src/qpid/framing/BodyHandler.cpp @@ -18,11 +18,11 @@ * under the License. * */ -#include "BodyHandler.h" -#include "AMQMethodBody.h" -#include "AMQHeaderBody.h" -#include "AMQContentBody.h" -#include "AMQHeartbeatBody.h" +#include "qpid/framing/BodyHandler.h" +#include "qpid/framing/AMQMethodBody.h" +#include "qpid/framing/AMQHeaderBody.h" +#include "qpid/framing/AMQContentBody.h" +#include "qpid/framing/AMQHeartbeatBody.h" #include <boost/cast.hpp> #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/framing/Buffer.cpp b/cpp/src/qpid/framing/Buffer.cpp index 6f1ad52e4a..051e7a2362 100644 --- a/cpp/src/qpid/framing/Buffer.cpp +++ b/cpp/src/qpid/framing/Buffer.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "Buffer.h" -#include "FieldTable.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/FieldTable.h" #include <string.h> #include <boost/format.hpp> namespace qpid { diff --git a/cpp/src/qpid/framing/Buffer.h b/cpp/src/qpid/framing/Buffer.h index 75d38519cb..cacca7806e 100644 --- a/cpp/src/qpid/framing/Buffer.h +++ b/cpp/src/qpid/framing/Buffer.h @@ -18,7 +18,7 @@ * under the License. * */ -#include "amqp_types.h" +#include "qpid/framing/amqp_types.h" #include "qpid/Exception.h" #include "qpid/CommonImportExport.h" #include <boost/iterator/iterator_facade.hpp> diff --git a/cpp/src/qpid/framing/ChannelHandler.h b/cpp/src/qpid/framing/ChannelHandler.h index 69aaeac492..ddab204578 100644 --- a/cpp/src/qpid/framing/ChannelHandler.h +++ b/cpp/src/qpid/framing/ChannelHandler.h @@ -21,8 +21,8 @@ * under the License. * */ -#include "FrameHandler.h" -#include "AMQFrame.h" +#include "qpid/framing/FrameHandler.h" +#include "qpid/framing/AMQFrame.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/Endian.cpp b/cpp/src/qpid/framing/Endian.cpp index 1948579b88..5acc3c459f 100644 --- a/cpp/src/qpid/framing/Endian.cpp +++ b/cpp/src/qpid/framing/Endian.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "Endian.h" +#include "qpid/framing/Endian.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp index 3e0921fe8d..bc832e9db4 100644 --- a/cpp/src/qpid/framing/FieldTable.cpp +++ b/cpp/src/qpid/framing/FieldTable.cpp @@ -18,11 +18,11 @@ * under the License. * */ -#include "FieldTable.h" -#include "Array.h" -#include "Buffer.h" -#include "Endian.h" -#include "FieldValue.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/framing/Array.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/Endian.h" +#include "qpid/framing/FieldValue.h" #include "qpid/Exception.h" #include "qpid/framing/reply_exceptions.h" #include <assert.h> diff --git a/cpp/src/qpid/framing/FieldTable.h b/cpp/src/qpid/framing/FieldTable.h index dfadfebdcb..72a00493af 100644 --- a/cpp/src/qpid/framing/FieldTable.h +++ b/cpp/src/qpid/framing/FieldTable.h @@ -22,7 +22,7 @@ #include <vector> #include <boost/shared_ptr.hpp> #include <map> -#include "amqp_types.h" +#include "qpid/framing/amqp_types.h" #include "qpid/CommonImportExport.h" #ifndef _FieldTable_ diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/cpp/src/qpid/framing/FieldValue.cpp index ecf469236d..5f7248a751 100644 --- a/cpp/src/qpid/framing/FieldValue.cpp +++ b/cpp/src/qpid/framing/FieldValue.cpp @@ -18,10 +18,10 @@ * under the License. * */ -#include "FieldValue.h" -#include "Array.h" -#include "Buffer.h" -#include "Endian.h" +#include "qpid/framing/FieldValue.h" +#include "qpid/framing/Array.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/Endian.h" #include "qpid/framing/reply_exceptions.h" namespace qpid { diff --git a/cpp/src/qpid/framing/FieldValue.h b/cpp/src/qpid/framing/FieldValue.h index 0f27700ac8..a648289844 100644 --- a/cpp/src/qpid/framing/FieldValue.h +++ b/cpp/src/qpid/framing/FieldValue.h @@ -22,17 +22,17 @@ */ #include "qpid/Exception.h" -#include "amqp_types.h" -#include "Buffer.h" -#include "FieldTable.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/FieldTable.h" #include "qpid/CommonImportExport.h" -#include "assert.h" - #include <iostream> #include <memory> #include <vector> +#include <assert.h> + namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/FrameDecoder.cpp b/cpp/src/qpid/framing/FrameDecoder.cpp index 529cdd76a7..90cbbd84a1 100644 --- a/cpp/src/qpid/framing/FrameDecoder.cpp +++ b/cpp/src/qpid/framing/FrameDecoder.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "FrameDecoder.h" -#include "Buffer.h" +#include "qpid/framing/FrameDecoder.h" +#include "qpid/framing/Buffer.h" #include "qpid/log/Statement.h" #include "qpid/framing/reply_exceptions.h" #include <algorithm> diff --git a/cpp/src/qpid/framing/FrameDecoder.h b/cpp/src/qpid/framing/FrameDecoder.h index bb054f9b42..26bed6c447 100644 --- a/cpp/src/qpid/framing/FrameDecoder.h +++ b/cpp/src/qpid/framing/FrameDecoder.h @@ -22,7 +22,7 @@ * */ -#include "AMQFrame.h" +#include "qpid/framing/AMQFrame.h" #include "qpid/CommonImportExport.h" namespace qpid { diff --git a/cpp/src/qpid/framing/FrameHandler.h b/cpp/src/qpid/framing/FrameHandler.h index 457968c35e..fa1fb535ef 100644 --- a/cpp/src/qpid/framing/FrameHandler.h +++ b/cpp/src/qpid/framing/FrameHandler.h @@ -20,7 +20,7 @@ * under the License. * */ -#include "Handler.h" +#include "qpid/framing/Handler.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/FrameSet.cpp b/cpp/src/qpid/framing/FrameSet.cpp index 9846f1d42b..f50035e49a 100644 --- a/cpp/src/qpid/framing/FrameSet.cpp +++ b/cpp/src/qpid/framing/FrameSet.cpp @@ -19,7 +19,7 @@ * */ -#include "FrameSet.h" +#include "qpid/framing/FrameSet.h" #include "qpid/framing/all_method_bodies.h" #include "qpid/framing/frame_functors.h" #include "qpid/framing/MessageProperties.h" diff --git a/cpp/src/qpid/framing/HeaderProperties.h b/cpp/src/qpid/framing/HeaderProperties.h index 39c448fc3c..8b1828daec 100644 --- a/cpp/src/qpid/framing/HeaderProperties.h +++ b/cpp/src/qpid/framing/HeaderProperties.h @@ -18,8 +18,8 @@ * under the License. * */ -#include "amqp_types.h" -#include "Buffer.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/Buffer.h" #ifndef _HeaderProperties_ #define _HeaderProperties_ diff --git a/cpp/src/qpid/framing/InitiationHandler.cpp b/cpp/src/qpid/framing/InitiationHandler.cpp index eceeaf4abc..7ded505a47 100644 --- a/cpp/src/qpid/framing/InitiationHandler.cpp +++ b/cpp/src/qpid/framing/InitiationHandler.cpp @@ -19,6 +19,6 @@ * */ -#include "InitiationHandler.h" +#include "qpid/framing/InitiationHandler.h" qpid::framing::InitiationHandler::~InitiationHandler() {} diff --git a/cpp/src/qpid/framing/InitiationHandler.h b/cpp/src/qpid/framing/InitiationHandler.h index 16a6b502e8..5dfcc6b468 100644 --- a/cpp/src/qpid/framing/InitiationHandler.h +++ b/cpp/src/qpid/framing/InitiationHandler.h @@ -23,7 +23,7 @@ #ifndef _InitiationHandler_ #define _InitiationHandler_ -#include "ProtocolInitiation.h" +#include "qpid/framing/ProtocolInitiation.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/InputHandler.h b/cpp/src/qpid/framing/InputHandler.h index 3a6d786a24..3efb23632a 100644 --- a/cpp/src/qpid/framing/InputHandler.h +++ b/cpp/src/qpid/framing/InputHandler.h @@ -21,7 +21,7 @@ * */ -#include "FrameHandler.h" +#include "qpid/framing/FrameHandler.h" #include <boost/noncopyable.hpp> namespace qpid { diff --git a/cpp/src/qpid/framing/MethodBodyFactory.h b/cpp/src/qpid/framing/MethodBodyFactory.h index da20407b6e..607ec9d959 100644 --- a/cpp/src/qpid/framing/MethodBodyFactory.h +++ b/cpp/src/qpid/framing/MethodBodyFactory.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "amqp_types.h" +#include "qpid/framing/amqp_types.h" #include <boost/intrusive_ptr.hpp> namespace qpid { diff --git a/cpp/src/qpid/framing/MethodContent.h b/cpp/src/qpid/framing/MethodContent.h index 737c0d6b7b..b290a0c140 100644 --- a/cpp/src/qpid/framing/MethodContent.h +++ b/cpp/src/qpid/framing/MethodContent.h @@ -22,7 +22,7 @@ #define _MethodContent_ #include <string> -#include "AMQHeaderBody.h" +#include "qpid/framing/AMQHeaderBody.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/ModelMethod.h b/cpp/src/qpid/framing/ModelMethod.h index afbdf7b6e2..d99bd06cfa 100644 --- a/cpp/src/qpid/framing/ModelMethod.h +++ b/cpp/src/qpid/framing/ModelMethod.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "AMQMethodBody.h" +#include "qpid/framing/AMQMethodBody.h" #include "qpid/framing/Header.h" namespace qpid { diff --git a/cpp/src/qpid/framing/OutputHandler.h b/cpp/src/qpid/framing/OutputHandler.h index 6f4b27fb72..88c95589da 100644 --- a/cpp/src/qpid/framing/OutputHandler.h +++ b/cpp/src/qpid/framing/OutputHandler.h @@ -22,7 +22,7 @@ * */ #include <boost/noncopyable.hpp> -#include "FrameHandler.h" +#include "qpid/framing/FrameHandler.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/cpp/src/qpid/framing/ProtocolInitiation.cpp index 50617de017..e617015d64 100644 --- a/cpp/src/qpid/framing/ProtocolInitiation.cpp +++ b/cpp/src/qpid/framing/ProtocolInitiation.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "ProtocolInitiation.h" +#include "qpid/framing/ProtocolInitiation.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/cpp/src/qpid/framing/ProtocolInitiation.h index 7a82b3575f..c519bc2442 100644 --- a/cpp/src/qpid/framing/ProtocolInitiation.h +++ b/cpp/src/qpid/framing/ProtocolInitiation.h @@ -18,10 +18,10 @@ * under the License. * */ -#include "amqp_types.h" -#include "Buffer.h" -#include "AMQDataBlock.h" -#include "ProtocolVersion.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/AMQDataBlock.h" +#include "qpid/framing/ProtocolVersion.h" #include "qpid/CommonImportExport.h" #ifndef _ProtocolInitiation_ diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/cpp/src/qpid/framing/ProtocolVersion.cpp index 7a96bfa925..c63cddb4cc 100644 --- a/cpp/src/qpid/framing/ProtocolVersion.cpp +++ b/cpp/src/qpid/framing/ProtocolVersion.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "ProtocolVersion.h" +#include "qpid/framing/ProtocolVersion.h" #include <sstream> using namespace qpid::framing; diff --git a/cpp/src/qpid/framing/ProtocolVersion.h b/cpp/src/qpid/framing/ProtocolVersion.h index 681c9daf21..f10b1bf21e 100644 --- a/cpp/src/qpid/framing/ProtocolVersion.h +++ b/cpp/src/qpid/framing/ProtocolVersion.h @@ -21,7 +21,7 @@ #ifndef _ProtocolVersion_ #define _ProtocolVersion_ -#include "amqp_types.h" +#include "qpid/framing/amqp_types.h" #include "qpid/CommonImportExport.h" namespace qpid diff --git a/cpp/src/qpid/framing/Proxy.cpp b/cpp/src/qpid/framing/Proxy.cpp index 6c3724bcdb..452fb13b01 100644 --- a/cpp/src/qpid/framing/Proxy.cpp +++ b/cpp/src/qpid/framing/Proxy.cpp @@ -16,9 +16,9 @@ * */ -#include "Proxy.h" -#include "AMQFrame.h" -#include "AMQMethodBody.h" +#include "qpid/framing/Proxy.h" +#include "qpid/framing/AMQFrame.h" +#include "qpid/framing/AMQMethodBody.h" #include "qpid/log/Statement.h" namespace qpid { diff --git a/cpp/src/qpid/framing/Proxy.h b/cpp/src/qpid/framing/Proxy.h index a9a6ce981e..0884e9cbd2 100644 --- a/cpp/src/qpid/framing/Proxy.h +++ b/cpp/src/qpid/framing/Proxy.h @@ -19,8 +19,8 @@ * */ -#include "FrameHandler.h" -#include "ProtocolVersion.h" +#include "qpid/framing/FrameHandler.h" +#include "qpid/framing/ProtocolVersion.h" #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/SendContent.cpp b/cpp/src/qpid/framing/SendContent.cpp index 2b8287a5c2..a26c19037b 100644 --- a/cpp/src/qpid/framing/SendContent.cpp +++ b/cpp/src/qpid/framing/SendContent.cpp @@ -19,7 +19,7 @@ * */ -#include "SendContent.h" +#include "qpid/framing/SendContent.h" qpid::framing::SendContent::SendContent(FrameHandler& h, uint16_t mfs, uint efc) : handler(h), maxFrameSize(mfs), diff --git a/cpp/src/qpid/framing/SequenceNumber.cpp b/cpp/src/qpid/framing/SequenceNumber.cpp index e61e3f2edf..41cb236629 100644 --- a/cpp/src/qpid/framing/SequenceNumber.cpp +++ b/cpp/src/qpid/framing/SequenceNumber.cpp @@ -19,8 +19,8 @@ * */ -#include "SequenceNumber.h" -#include "Buffer.h" +#include "qpid/framing/SequenceNumber.h" +#include "qpid/framing/Buffer.h" #include <ostream> using qpid::framing::SequenceNumber; diff --git a/cpp/src/qpid/framing/SequenceNumber.h b/cpp/src/qpid/framing/SequenceNumber.h index c208739cdd..6058367593 100644 --- a/cpp/src/qpid/framing/SequenceNumber.h +++ b/cpp/src/qpid/framing/SequenceNumber.h @@ -21,7 +21,7 @@ #ifndef _framing_SequenceNumber_h #define _framing_SequenceNumber_h -#include "amqp_types.h" +#include "qpid/framing/amqp_types.h" #include <boost/operators.hpp> #include <iosfwd> #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/SequenceNumberSet.cpp b/cpp/src/qpid/framing/SequenceNumberSet.cpp index 58db2614fb..e9d78f3c17 100644 --- a/cpp/src/qpid/framing/SequenceNumberSet.cpp +++ b/cpp/src/qpid/framing/SequenceNumberSet.cpp @@ -19,7 +19,7 @@ * */ -#include "SequenceNumberSet.h" +#include "qpid/framing/SequenceNumberSet.h" using namespace qpid::framing; diff --git a/cpp/src/qpid/framing/SequenceNumberSet.h b/cpp/src/qpid/framing/SequenceNumberSet.h index 8e023ba535..c8356c8163 100644 --- a/cpp/src/qpid/framing/SequenceNumberSet.h +++ b/cpp/src/qpid/framing/SequenceNumberSet.h @@ -22,9 +22,9 @@ #define _framing_SequenceNumberSet_h #include <ostream> -#include "amqp_types.h" -#include "Buffer.h" -#include "SequenceNumber.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/Buffer.h" +#include "qpid/framing/SequenceNumber.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/InlineVector.h" #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/SequenceSet.cpp b/cpp/src/qpid/framing/SequenceSet.cpp index 1c913e68f8..dcfb4689b6 100644 --- a/cpp/src/qpid/framing/SequenceSet.cpp +++ b/cpp/src/qpid/framing/SequenceSet.cpp @@ -19,8 +19,8 @@ * */ -#include "SequenceSet.h" -#include "Buffer.h" +#include "qpid/framing/SequenceSet.h" +#include "qpid/framing/Buffer.h" #include "qpid/framing/reply_exceptions.h" using namespace qpid::framing; diff --git a/cpp/src/qpid/framing/SequenceSet.h b/cpp/src/qpid/framing/SequenceSet.h index a5ee6cd649..f1da828afc 100644 --- a/cpp/src/qpid/framing/SequenceSet.h +++ b/cpp/src/qpid/framing/SequenceSet.h @@ -21,7 +21,7 @@ #ifndef _framing_SequenceSet_h #define _framing_SequenceSet_h -#include "SequenceNumber.h" +#include "qpid/framing/SequenceNumber.h" #include "qpid/RangeSet.h" #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/framing/StructHelper.h b/cpp/src/qpid/framing/StructHelper.h index 89f556ad3c..00b15be78d 100644 --- a/cpp/src/qpid/framing/StructHelper.h +++ b/cpp/src/qpid/framing/StructHelper.h @@ -23,7 +23,7 @@ #include "qpid/Exception.h" #include "qpid/CommonImportExport.h" -#include "Buffer.h" +#include "qpid/framing/Buffer.h" #include <stdlib.h> // For alloca diff --git a/cpp/src/qpid/framing/TransferContent.cpp b/cpp/src/qpid/framing/TransferContent.cpp index 3fc54296fa..837d7d346a 100644 --- a/cpp/src/qpid/framing/TransferContent.cpp +++ b/cpp/src/qpid/framing/TransferContent.cpp @@ -19,7 +19,7 @@ * */ -#include "TransferContent.h" +#include "qpid/framing/TransferContent.h" namespace qpid { namespace framing { diff --git a/cpp/src/qpid/framing/TransferContent.h b/cpp/src/qpid/framing/TransferContent.h index 236a0b6d93..5fe1a513a9 100644 --- a/cpp/src/qpid/framing/TransferContent.h +++ b/cpp/src/qpid/framing/TransferContent.h @@ -21,8 +21,8 @@ #ifndef _TransferContent_ #define _TransferContent_ -#include "FrameSet.h" -#include "MethodContent.h" +#include "qpid/framing/FrameSet.h" +#include "qpid/framing/MethodContent.h" #include "qpid/Exception.h" #include "qpid/framing/MessageProperties.h" #include "qpid/framing/DeliveryProperties.h" diff --git a/cpp/src/qpid/framing/Uuid.cpp b/cpp/src/qpid/framing/Uuid.cpp index fbbaac1cf5..c0b41c6906 100644 --- a/cpp/src/qpid/framing/Uuid.cpp +++ b/cpp/src/qpid/framing/Uuid.cpp @@ -16,7 +16,7 @@ * */ -#include "Uuid.h" +#include "qpid/framing/Uuid.h" #include "qpid/Exception.h" #include "qpid/framing/Buffer.h" #include "qpid/framing/reply_exceptions.h" diff --git a/cpp/src/qpid/framing/amqp_framing.h b/cpp/src/qpid/framing/amqp_framing.h index 4e4747c3f4..3a8b39afb5 100644 --- a/cpp/src/qpid/framing/amqp_framing.h +++ b/cpp/src/qpid/framing/amqp_framing.h @@ -18,15 +18,15 @@ * under the License. * */ -#include "amqp_types.h" -#include "AMQFrame.h" -#include "AMQBody.h" -#include "BodyHandler.h" -#include "AMQMethodBody.h" -#include "AMQHeaderBody.h" -#include "AMQContentBody.h" -#include "AMQHeartbeatBody.h" -#include "InputHandler.h" -#include "OutputHandler.h" -#include "ProtocolInitiation.h" -#include "ProtocolVersion.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/AMQFrame.h" +#include "qpid/framing/AMQBody.h" +#include "qpid/framing/BodyHandler.h" +#include "qpid/framing/AMQMethodBody.h" +#include "qpid/framing/AMQHeaderBody.h" +#include "qpid/framing/AMQContentBody.h" +#include "qpid/framing/AMQHeartbeatBody.h" +#include "qpid/framing/InputHandler.h" +#include "qpid/framing/OutputHandler.h" +#include "qpid/framing/ProtocolInitiation.h" +#include "qpid/framing/ProtocolVersion.h" diff --git a/cpp/src/qpid/framing/amqp_types_full.h b/cpp/src/qpid/framing/amqp_types_full.h index d0aaf28cb4..c5d84dedea 100644 --- a/cpp/src/qpid/framing/amqp_types_full.h +++ b/cpp/src/qpid/framing/amqp_types_full.h @@ -29,10 +29,10 @@ * times. */ -#include "amqp_types.h" -#include "Array.h" -#include "FieldTable.h" -#include "SequenceSet.h" -#include "Uuid.h" +#include "qpid/framing/amqp_types.h" +#include "qpid/framing/Array.h" +#include "qpid/framing/FieldTable.h" +#include "qpid/framing/SequenceSet.h" +#include "qpid/framing/Uuid.h" #endif /*!_framing_amqp_types_decl_h*/ diff --git a/cpp/src/qpid/log/Logger.cpp b/cpp/src/qpid/log/Logger.cpp index fe16fcc232..939e2502cc 100644 --- a/cpp/src/qpid/log/Logger.cpp +++ b/cpp/src/qpid/log/Logger.cpp @@ -16,9 +16,9 @@ * */ -#include "Logger.h" -#include "Options.h" -#include "SinkOptions.h" +#include "qpid/log/Logger.h" +#include "qpid/log/Options.h" +#include "qpid/log/SinkOptions.h" #include "qpid/memory.h" #include "qpid/sys/Thread.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/log/Logger.h b/cpp/src/qpid/log/Logger.h index 0cbd7685d6..35aa13f7ef 100644 --- a/cpp/src/qpid/log/Logger.h +++ b/cpp/src/qpid/log/Logger.h @@ -12,8 +12,8 @@ * */ -#include "Selector.h" -#include "Options.h" +#include "qpid/log/Selector.h" +#include "qpid/log/Options.h" #include "qpid/sys/Mutex.h" #include <boost/ptr_container/ptr_vector.hpp> #include <boost/noncopyable.hpp> diff --git a/cpp/src/qpid/log/Options.cpp b/cpp/src/qpid/log/Options.cpp index a33da6fd8f..24ef413cbc 100644 --- a/cpp/src/qpid/log/Options.cpp +++ b/cpp/src/qpid/log/Options.cpp @@ -16,9 +16,9 @@ * */ -#include "Options.h" -#include "SinkOptions.h" -#include "Statement.h" +#include "qpid/log/Options.h" +#include "qpid/log/SinkOptions.h" +#include "qpid/log/Statement.h" #include "qpid/Options.h" #include <map> #include <string> diff --git a/cpp/src/qpid/log/Options.h b/cpp/src/qpid/log/Options.h index 5e7bd433af..bbc47b47d3 100644 --- a/cpp/src/qpid/log/Options.h +++ b/cpp/src/qpid/log/Options.h @@ -20,7 +20,7 @@ */ #include "qpid/Options.h" #include "qpid/CommonImportExport.h" -#include "SinkOptions.h" +#include "qpid/log/SinkOptions.h" #include <iosfwd> #include <memory> diff --git a/cpp/src/qpid/log/OstreamOutput.cpp b/cpp/src/qpid/log/OstreamOutput.cpp index c96a311a4e..9b6ec1f8aa 100644 --- a/cpp/src/qpid/log/OstreamOutput.cpp +++ b/cpp/src/qpid/log/OstreamOutput.cpp @@ -16,7 +16,7 @@ * */ -#include "OstreamOutput.h" +#include "qpid/log/OstreamOutput.h" #include <stdexcept> using namespace std; diff --git a/cpp/src/qpid/log/OstreamOutput.h b/cpp/src/qpid/log/OstreamOutput.h index 8df38468ad..12fd4ce425 100644 --- a/cpp/src/qpid/log/OstreamOutput.h +++ b/cpp/src/qpid/log/OstreamOutput.h @@ -12,7 +12,7 @@ * */ -#include "Logger.h" +#include "qpid/log/Logger.h" #include <boost/scoped_ptr.hpp> #include <fstream> #include <ostream> diff --git a/cpp/src/qpid/log/Selector.cpp b/cpp/src/qpid/log/Selector.cpp index 0a629edc3e..a4bc580470 100644 --- a/cpp/src/qpid/log/Selector.cpp +++ b/cpp/src/qpid/log/Selector.cpp @@ -16,8 +16,8 @@ * */ -#include "Selector.h" -#include "Options.h" +#include "qpid/log/Selector.h" +#include "qpid/log/Options.h" #include <boost/bind.hpp> #include <algorithm> #include <string.h> diff --git a/cpp/src/qpid/log/Selector.h b/cpp/src/qpid/log/Selector.h index 070ffd4abf..3c18fb6ba2 100644 --- a/cpp/src/qpid/log/Selector.h +++ b/cpp/src/qpid/log/Selector.h @@ -19,7 +19,7 @@ * */ -#include "Statement.h" +#include "qpid/log/Statement.h" #include "qpid/CommonImportExport.h" #include <vector> diff --git a/cpp/src/qpid/log/Statement.cpp b/cpp/src/qpid/log/Statement.cpp index 090a993e78..6a32b50096 100644 --- a/cpp/src/qpid/log/Statement.cpp +++ b/cpp/src/qpid/log/Statement.cpp @@ -16,8 +16,8 @@ * */ -#include "Statement.h" -#include "Logger.h" +#include "qpid/log/Statement.h" +#include "qpid/log/Logger.h" #include <boost/bind.hpp> #include <stdexcept> #include <algorithm> diff --git a/cpp/src/qpid/log/posix/SinkOptions.cpp b/cpp/src/qpid/log/posix/SinkOptions.cpp index 985cb32c5c..292e9147f6 100644 --- a/cpp/src/qpid/log/posix/SinkOptions.cpp +++ b/cpp/src/qpid/log/posix/SinkOptions.cpp @@ -16,7 +16,7 @@ * */ -#include "SinkOptions.h" +#include "qpid/log/posix/SinkOptions.h" #include "qpid/log/SinkOptions.h" #include "qpid/log/Logger.h" #include "qpid/log/OstreamOutput.h" diff --git a/cpp/src/qpid/log/windows/SinkOptions.cpp b/cpp/src/qpid/log/windows/SinkOptions.cpp index cfcb965464..28f4b267e0 100644 --- a/cpp/src/qpid/log/windows/SinkOptions.cpp +++ b/cpp/src/qpid/log/windows/SinkOptions.cpp @@ -16,7 +16,7 @@ * */ -#include "SinkOptions.h" +#include "qpid/log/windows/SinkOptions.h" #include "qpid/log/SinkOptions.h" #include "qpid/log/Logger.h" #include "qpid/log/OstreamOutput.h" diff --git a/cpp/src/qpid/management/IdAllocator.h b/cpp/src/qpid/management/IdAllocator.h index 6fbc99afff..6f49d6d13f 100644 --- a/cpp/src/qpid/management/IdAllocator.h +++ b/cpp/src/qpid/management/IdAllocator.h @@ -22,7 +22,7 @@ * */ -#include "Manageable.h" +#include "qpid/management/Manageable.h" namespace qpid { namespace management { diff --git a/cpp/src/qpid/management/Manageable.cpp b/cpp/src/qpid/management/Manageable.cpp index 08bb541fc7..e487dfc455 100644 --- a/cpp/src/qpid/management/Manageable.cpp +++ b/cpp/src/qpid/management/Manageable.cpp @@ -17,7 +17,7 @@ // under the License. // -#include "Manageable.h" +#include "qpid/management/Manageable.h" using namespace qpid::management; using std::string; diff --git a/cpp/src/qpid/management/Manageable.h b/cpp/src/qpid/management/Manageable.h index ededa6141e..dd4e06b018 100644 --- a/cpp/src/qpid/management/Manageable.h +++ b/cpp/src/qpid/management/Manageable.h @@ -20,8 +20,8 @@ // under the License. // -#include "ManagementObject.h" -#include "Args.h" +#include "qpid/management/ManagementObject.h" +#include "qpid/management/Args.h" #include <string> #include "qpid/CommonImportExport.h" diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index 75f7453058..bc106dbe48 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -19,9 +19,9 @@ * */ -#include "ManagementAgent.h" -#include "ManagementObject.h" -#include "IdAllocator.h" +#include "qpid/management/ManagementAgent.h" +#include "qpid/management/ManagementObject.h" +#include "qpid/management/IdAllocator.h" #include "qpid/broker/DeliverableMessage.h" #include "qpid/log/Statement.h" #include <qpid/broker/Message.h> diff --git a/cpp/src/qpid/management/ManagementAgent.h b/cpp/src/qpid/management/ManagementAgent.h index 34d53f778d..c9c9b3f66d 100644 --- a/cpp/src/qpid/management/ManagementAgent.h +++ b/cpp/src/qpid/management/ManagementAgent.h @@ -28,9 +28,9 @@ #include "qpid/framing/Uuid.h" #include "qpid/sys/Mutex.h" #include "qpid/broker/ConnectionToken.h" -#include "ManagementObject.h" -#include "ManagementEvent.h" -#include "Manageable.h" +#include "qpid/management/ManagementObject.h" +#include "qpid/management/ManagementEvent.h" +#include "qpid/management/Manageable.h" #include "qmf/org/apache/qpid/broker/Agent.h" #include <qpid/framing/AMQFrame.h> #include <memory> diff --git a/cpp/src/qpid/management/ManagementEvent.h b/cpp/src/qpid/management/ManagementEvent.h index 8566f31c47..6eeea32b70 100644 --- a/cpp/src/qpid/management/ManagementEvent.h +++ b/cpp/src/qpid/management/ManagementEvent.h @@ -22,7 +22,7 @@ * */ -#include "ManagementObject.h" +#include "qpid/management/ManagementObject.h" #include <qpid/framing/Buffer.h> #include <string> diff --git a/cpp/src/qpid/management/ManagementExchange.cpp b/cpp/src/qpid/management/ManagementExchange.cpp index 0793b2d18c..b90bcd87d8 100644 --- a/cpp/src/qpid/management/ManagementExchange.cpp +++ b/cpp/src/qpid/management/ManagementExchange.cpp @@ -19,7 +19,7 @@ * */ -#include "ManagementExchange.h" +#include "qpid/management/ManagementExchange.h" #include "qpid/log/Statement.h" using namespace qpid::management; diff --git a/cpp/src/qpid/management/ManagementExchange.h b/cpp/src/qpid/management/ManagementExchange.h index 5e51683515..3fa4039af7 100644 --- a/cpp/src/qpid/management/ManagementExchange.h +++ b/cpp/src/qpid/management/ManagementExchange.h @@ -22,7 +22,7 @@ #define _ManagementExchange_ #include "qpid/broker/TopicExchange.h" -#include "ManagementAgent.h" +#include "qpid/management/ManagementAgent.h" namespace qpid { namespace broker { diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/cpp/src/qpid/management/ManagementObject.cpp index 08008b3d79..bcb6159663 100644 --- a/cpp/src/qpid/management/ManagementObject.cpp +++ b/cpp/src/qpid/management/ManagementObject.cpp @@ -19,8 +19,8 @@ * */ -#include "Manageable.h" -#include "ManagementObject.h" +#include "qpid/management/Manageable.h" +#include "qpid/management/ManagementObject.h" #include "qpid/framing/FieldTable.h" #include "qpid/sys/Thread.h" diff --git a/cpp/src/qpid/replication/ReplicatingEventListener.cpp b/cpp/src/qpid/replication/ReplicatingEventListener.cpp index 60d5fffc0b..1a3ce1c069 100644 --- a/cpp/src/qpid/replication/ReplicatingEventListener.cpp +++ b/cpp/src/qpid/replication/ReplicatingEventListener.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "ReplicatingEventListener.h" -#include "constants.h" +#include "qpid/replication/ReplicatingEventListener.h" +#include "qpid/replication/constants.h" #include "qpid/broker/Broker.h" #include "qpid/broker/DeliverableMessage.h" #include "qpid/broker/QueueEvents.h" diff --git a/cpp/src/qpid/replication/ReplicationExchange.cpp b/cpp/src/qpid/replication/ReplicationExchange.cpp index 613ab74d8c..d3ead7501f 100644 --- a/cpp/src/qpid/replication/ReplicationExchange.cpp +++ b/cpp/src/qpid/replication/ReplicationExchange.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "ReplicationExchange.h" -#include "constants.h" +#include "qpid/replication/ReplicationExchange.h" +#include "qpid/replication/constants.h" #include "qpid/Plugin.h" #include "qpid/broker/Broker.h" #include "qpid/broker/ExchangeRegistry.h" diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/cpp/src/qpid/sys/AggregateOutput.h index 4e3190a093..71ad713eb7 100644 --- a/cpp/src/qpid/sys/AggregateOutput.h +++ b/cpp/src/qpid/sys/AggregateOutput.h @@ -21,9 +21,9 @@ #ifndef _AggregateOutput_ #define _AggregateOutput_ -#include "Monitor.h" -#include "OutputControl.h" -#include "OutputTask.h" +#include "qpid/sys/Monitor.h" +#include "qpid/sys/OutputControl.h" +#include "qpid/sys/OutputTask.h" #include "qpid/CommonImportExport.h" #include <algorithm> diff --git a/cpp/src/qpid/sys/AsynchIOHandler.cpp b/cpp/src/qpid/sys/AsynchIOHandler.cpp index 3b85a63d19..8094abd43d 100644 --- a/cpp/src/qpid/sys/AsynchIOHandler.cpp +++ b/cpp/src/qpid/sys/AsynchIOHandler.cpp @@ -19,7 +19,7 @@ * */ -#include "AsynchIOHandler.h" +#include "qpid/sys/AsynchIOHandler.h" #include "qpid/sys/AsynchIO.h" #include "qpid/sys/Socket.h" #include "qpid/framing/AMQP_HighestVersion.h" diff --git a/cpp/src/qpid/sys/AsynchIOHandler.h b/cpp/src/qpid/sys/AsynchIOHandler.h index 059b22a935..9785f445a4 100644 --- a/cpp/src/qpid/sys/AsynchIOHandler.h +++ b/cpp/src/qpid/sys/AsynchIOHandler.h @@ -21,10 +21,10 @@ * */ -#include "OutputControl.h" -#include "ConnectionCodec.h" -#include "AtomicValue.h" -#include "Mutex.h" +#include "qpid/sys/OutputControl.h" +#include "qpid/sys/ConnectionCodec.h" +#include "qpid/sys/AtomicValue.h" +#include "qpid/sys/Mutex.h" #include "qpid/CommonImportExport.h" namespace qpid { diff --git a/cpp/src/qpid/sys/AtomicCount.h b/cpp/src/qpid/sys/AtomicCount.h index d598b49427..94580c61f3 100644 --- a/cpp/src/qpid/sys/AtomicCount.h +++ b/cpp/src/qpid/sys/AtomicCount.h @@ -20,7 +20,7 @@ */ #include <boost/detail/atomic_count.hpp> -#include "ScopedIncrement.h" +#include "qpid/sys/ScopedIncrement.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/cpp/src/qpid/sys/BlockingQueue.h index a05a10d811..210cb4ad82 100644 --- a/cpp/src/qpid/sys/BlockingQueue.h +++ b/cpp/src/qpid/sys/BlockingQueue.h @@ -22,7 +22,7 @@ * */ -#include "Waitable.h" +#include "qpid/sys/Waitable.h" #include <queue> diff --git a/cpp/src/qpid/sys/ConnectionCodec.h b/cpp/src/qpid/sys/ConnectionCodec.h index 7f5e2f831c..880d4f0013 100644 --- a/cpp/src/qpid/sys/ConnectionCodec.h +++ b/cpp/src/qpid/sys/ConnectionCodec.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "Codec.h" +#include "qpid/sys/Codec.h" #include "qpid/framing/ProtocolVersion.h" namespace qpid { diff --git a/cpp/src/qpid/sys/ConnectionInputHandler.h b/cpp/src/qpid/sys/ConnectionInputHandler.h index 9a5b9f75a5..9e85c66924 100644 --- a/cpp/src/qpid/sys/ConnectionInputHandler.h +++ b/cpp/src/qpid/sys/ConnectionInputHandler.h @@ -22,8 +22,8 @@ #define _ConnectionInputHandler_ #include "qpid/framing/InputHandler.h" -#include "OutputTask.h" -#include "TimeoutHandler.h" +#include "qpid/sys/OutputTask.h" +#include "qpid/sys/TimeoutHandler.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/cpp/src/qpid/sys/ConnectionOutputHandler.h index de0bef3630..421dd7c269 100644 --- a/cpp/src/qpid/sys/ConnectionOutputHandler.h +++ b/cpp/src/qpid/sys/ConnectionOutputHandler.h @@ -22,7 +22,7 @@ #define _ConnectionOutputHandler_ #include "qpid/framing/OutputHandler.h" -#include "OutputControl.h" +#include "qpid/sys/OutputControl.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h index 909631a8c4..95a08d15ae 100644 --- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h +++ b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h @@ -22,7 +22,7 @@ * */ -#include "ConnectionOutputHandler.h" +#include "qpid/sys/ConnectionOutputHandler.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/CopyOnWriteArray.h b/cpp/src/qpid/sys/CopyOnWriteArray.h index 577a475afd..e4ae3a6094 100644 --- a/cpp/src/qpid/sys/CopyOnWriteArray.h +++ b/cpp/src/qpid/sys/CopyOnWriteArray.h @@ -22,7 +22,7 @@ * */ -#include "Mutex.h" +#include "qpid/sys/Mutex.h" #include <algorithm> #include <vector> #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/sys/DispatchHandle.cpp b/cpp/src/qpid/sys/DispatchHandle.cpp index 7bf305d275..0a237d837b 100644 --- a/cpp/src/qpid/sys/DispatchHandle.cpp +++ b/cpp/src/qpid/sys/DispatchHandle.cpp @@ -19,7 +19,7 @@ * */ -#include "DispatchHandle.h" +#include "qpid/sys/DispatchHandle.h" #include <algorithm> diff --git a/cpp/src/qpid/sys/DispatchHandle.h b/cpp/src/qpid/sys/DispatchHandle.h index 860665877c..37db776a09 100644 --- a/cpp/src/qpid/sys/DispatchHandle.h +++ b/cpp/src/qpid/sys/DispatchHandle.h @@ -22,8 +22,8 @@ * */ -#include "Poller.h" -#include "Mutex.h" +#include "qpid/sys/Poller.h" +#include "qpid/sys/Mutex.h" #include "qpid/CommonImportExport.h" #include <boost/function.hpp> diff --git a/cpp/src/qpid/sys/Dispatcher.cpp b/cpp/src/qpid/sys/Dispatcher.cpp index e8ae6bc2fe..5f52dcd990 100644 --- a/cpp/src/qpid/sys/Dispatcher.cpp +++ b/cpp/src/qpid/sys/Dispatcher.cpp @@ -19,7 +19,7 @@ * */ -#include "Dispatcher.h" +#include "qpid/sys/Dispatcher.h" #include <assert.h> diff --git a/cpp/src/qpid/sys/Dispatcher.h b/cpp/src/qpid/sys/Dispatcher.h index 2f3ed10901..e8213d0579 100644 --- a/cpp/src/qpid/sys/Dispatcher.h +++ b/cpp/src/qpid/sys/Dispatcher.h @@ -22,8 +22,8 @@ * */ -#include "Poller.h" -#include "Runnable.h" +#include "qpid/sys/Poller.h" +#include "qpid/sys/Runnable.h" #include "qpid/CommonImportExport.h" namespace qpid { diff --git a/cpp/src/qpid/sys/LatencyTracker.h b/cpp/src/qpid/sys/LatencyTracker.h index fe423ec228..3294528ff6 100644 --- a/cpp/src/qpid/sys/LatencyTracker.h +++ b/cpp/src/qpid/sys/LatencyTracker.h @@ -22,7 +22,7 @@ * */ -#include "Time.h" +#include "qpid/sys/Time.h" #include <string> #include <limits> #include <map> diff --git a/cpp/src/qpid/sys/LockFile.h b/cpp/src/qpid/sys/LockFile.h index 71cb5e2f10..1f0a9e13b3 100644 --- a/cpp/src/qpid/sys/LockFile.h +++ b/cpp/src/qpid/sys/LockFile.h @@ -24,7 +24,7 @@ #include <string> #include "qpid/CommonImportExport.h" -#include "IntegerTypes.h" +#include "qpid/sys/IntegerTypes.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h index 2dd405efaf..76c7118928 100644 --- a/cpp/src/qpid/sys/Monitor.h +++ b/cpp/src/qpid/sys/Monitor.h @@ -22,7 +22,7 @@ * */ -#include "Condition.h" +#include "qpid/sys/Condition.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/OutputControl.h b/cpp/src/qpid/sys/OutputControl.h index d813428b67..eae99beb0f 100644 --- a/cpp/src/qpid/sys/OutputControl.h +++ b/cpp/src/qpid/sys/OutputControl.h @@ -19,7 +19,7 @@ * */ -#include "IntegerTypes.h" +#include "qpid/sys/IntegerTypes.h" #ifndef _OutputControl_ #define _OutputControl_ diff --git a/cpp/src/qpid/sys/Poller.h b/cpp/src/qpid/sys/Poller.h index fd45848b79..413d4242b8 100644 --- a/cpp/src/qpid/sys/Poller.h +++ b/cpp/src/qpid/sys/Poller.h @@ -22,8 +22,8 @@ * */ -#include "Time.h" -#include "Runnable.h" +#include "qpid/sys/Time.h" +#include "qpid/sys/Runnable.h" #include "qpid/CommonImportExport.h" #include <boost/shared_ptr.hpp> diff --git a/cpp/src/qpid/sys/ProtocolFactory.h b/cpp/src/qpid/sys/ProtocolFactory.h index 56ab404d82..b233b2da1a 100644 --- a/cpp/src/qpid/sys/ProtocolFactory.h +++ b/cpp/src/qpid/sys/ProtocolFactory.h @@ -24,7 +24,7 @@ #include "qpid/sys/IntegerTypes.h" #include "qpid/SharedObject.h" -#include "ConnectionCodec.h" +#include "qpid/sys/ConnectionCodec.h" #include <boost/function.hpp> namespace qpid { diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/cpp/src/qpid/sys/RdmaIOPlugin.cpp index f931aeb5ea..6eafb6cf0b 100644 --- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp +++ b/cpp/src/qpid/sys/RdmaIOPlugin.cpp @@ -19,7 +19,7 @@ * */ -#include "ProtocolFactory.h" +#include "qpid/sys/ProtocolFactory.h" #include "qpid/Plugin.h" #include "qpid/broker/Broker.h" diff --git a/cpp/src/qpid/sys/Runnable.cpp b/cpp/src/qpid/sys/Runnable.cpp index 30122c682f..325d87c91b 100644 --- a/cpp/src/qpid/sys/Runnable.cpp +++ b/cpp/src/qpid/sys/Runnable.cpp @@ -16,7 +16,7 @@ * */ -#include "Runnable.h" +#include "qpid/sys/Runnable.h" #include <boost/bind.hpp> namespace qpid { diff --git a/cpp/src/qpid/sys/SecurityLayer.h b/cpp/src/qpid/sys/SecurityLayer.h index 6ad29eea80..52bc40e352 100644 --- a/cpp/src/qpid/sys/SecurityLayer.h +++ b/cpp/src/qpid/sys/SecurityLayer.h @@ -21,7 +21,7 @@ * under the License. * */ -#include "Codec.h" +#include "qpid/sys/Codec.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/Semaphore.h b/cpp/src/qpid/sys/Semaphore.h index af937b60b8..9d70f89aeb 100644 --- a/cpp/src/qpid/sys/Semaphore.h +++ b/cpp/src/qpid/sys/Semaphore.h @@ -19,7 +19,7 @@ * */ -#include "Monitor.h" +#include "qpid/sys/Monitor.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/Shlib.cpp b/cpp/src/qpid/sys/Shlib.cpp index 8fd3f42cc6..342d726876 100644 --- a/cpp/src/qpid/sys/Shlib.cpp +++ b/cpp/src/qpid/sys/Shlib.cpp @@ -18,7 +18,7 @@ * */ -#include "Shlib.h" +#include "qpid/sys/Shlib.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h index e6555f5774..f389e99cb8 100644 --- a/cpp/src/qpid/sys/Socket.h +++ b/cpp/src/qpid/sys/Socket.h @@ -22,7 +22,7 @@ * */ -#include "IOHandle.h" +#include "qpid/sys/IOHandle.h" #include "qpid/sys/IntegerTypes.h" #include "qpid/CommonImportExport.h" #include <string> diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/cpp/src/qpid/sys/SslPlugin.cpp index 203aa9a1d7..a0d032906b 100644 --- a/cpp/src/qpid/sys/SslPlugin.cpp +++ b/cpp/src/qpid/sys/SslPlugin.cpp @@ -19,7 +19,7 @@ * */ -#include "ProtocolFactory.h" +#include "qpid/sys/ProtocolFactory.h" #include "qpid/Plugin.h" #include "qpid/sys/ssl/check.h" diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/cpp/src/qpid/sys/TCPIOPlugin.cpp index 636b903e29..b456beb098 100644 --- a/cpp/src/qpid/sys/TCPIOPlugin.cpp +++ b/cpp/src/qpid/sys/TCPIOPlugin.cpp @@ -19,9 +19,9 @@ * */ -#include "ProtocolFactory.h" -#include "AsynchIOHandler.h" -#include "AsynchIO.h" +#include "qpid/sys/ProtocolFactory.h" +#include "qpid/sys/AsynchIOHandler.h" +#include "qpid/sys/AsynchIO.h" #include "qpid/Plugin.h" #include "qpid/sys/Socket.h" diff --git a/cpp/src/qpid/sys/Timer.cpp b/cpp/src/qpid/sys/Timer.cpp index fd42d7d62e..d77f4a0b1e 100644 --- a/cpp/src/qpid/sys/Timer.cpp +++ b/cpp/src/qpid/sys/Timer.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "Timer.h" -#include "Mutex.h" +#include "qpid/sys/Timer.h" +#include "qpid/sys/Mutex.h" #include <iostream> #include <numeric> diff --git a/cpp/src/qpid/sys/apr/APRBase.cpp b/cpp/src/qpid/sys/apr/APRBase.cpp index 724c489303..8bdba66bdc 100644 --- a/cpp/src/qpid/sys/apr/APRBase.cpp +++ b/cpp/src/qpid/sys/apr/APRBase.cpp @@ -20,7 +20,7 @@ */ #include <iostream> #include "qpid/log/Statement.h" -#include "APRBase.h" +#include "qpid/sys/apr/APRBase.h" using namespace qpid::sys; diff --git a/cpp/src/qpid/sys/apr/APRPool.cpp b/cpp/src/qpid/sys/apr/APRPool.cpp index e8b71f6e8a..e221bfc2f1 100644 --- a/cpp/src/qpid/sys/apr/APRPool.cpp +++ b/cpp/src/qpid/sys/apr/APRPool.cpp @@ -19,8 +19,8 @@ * */ -#include "APRPool.h" -#include "APRBase.h" +#include "qpid/sys/apr/APRPool.h" +#include "qpid/sys/apr/APRBase.h" #include <boost/pool/detail/singleton.hpp> using namespace qpid::sys; diff --git a/cpp/src/qpid/sys/apr/Condition.h b/cpp/src/qpid/sys/apr/Condition.h index 5e544219ab..66d465ca75 100644 --- a/cpp/src/qpid/sys/apr/Condition.h +++ b/cpp/src/qpid/sys/apr/Condition.h @@ -22,7 +22,7 @@ * */ -#include "APRPool.h" +#include "qpid/sys/apr/APRPool.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/sys/apr/Mutex.h b/cpp/src/qpid/sys/apr/Mutex.h index 51089c98ff..cb75f5b339 100644 --- a/cpp/src/qpid/sys/apr/Mutex.h +++ b/cpp/src/qpid/sys/apr/Mutex.h @@ -19,8 +19,8 @@ * */ -#include "APRBase.h" -#include "APRPool.h" +#include "qpid/sys/apr/APRBase.h" +#include "qpid/sys/apr/APRPool.h" #include <boost/noncopyable.hpp> #include <apr_thread_mutex.h> diff --git a/cpp/src/qpid/sys/apr/Shlib.cpp b/cpp/src/qpid/sys/apr/Shlib.cpp index b0ba706713..b7ee13a03b 100644 --- a/cpp/src/qpid/sys/apr/Shlib.cpp +++ b/cpp/src/qpid/sys/apr/Shlib.cpp @@ -19,8 +19,8 @@ */ #include "qpid/sys/Shlib.h" -#include "APRBase.h" -#include "APRPool.h" +#include "qpid/sys/apr/APRBase.h" +#include "qpid/sys/apr/APRPool.h" #include <apr_dso.h> namespace qpid { diff --git a/cpp/src/qpid/sys/apr/Socket.cpp b/cpp/src/qpid/sys/apr/Socket.cpp index 577268844a..d9024d11c1 100644 --- a/cpp/src/qpid/sys/apr/Socket.cpp +++ b/cpp/src/qpid/sys/apr/Socket.cpp @@ -22,8 +22,8 @@ #include "qpid/sys/Socket.h" -#include "APRBase.h" -#include "APRPool.h" +#include "qpid/sys/apr/APRBase.h" +#include "qpid/sys/apr/APRPool.h" #include <apr_network_io.h> diff --git a/cpp/src/qpid/sys/apr/Thread.cpp b/cpp/src/qpid/sys/apr/Thread.cpp index 3369ef7eb1..b52d0e6ace 100644 --- a/cpp/src/qpid/sys/apr/Thread.cpp +++ b/cpp/src/qpid/sys/apr/Thread.cpp @@ -19,7 +19,7 @@ * */ -#include "Thread.h" +#include "qpid/sys/apr/Thread.h" #include "qpid/sys/Runnable.h" using namespace qpid::sys; diff --git a/cpp/src/qpid/sys/apr/Thread.h b/cpp/src/qpid/sys/apr/Thread.h index 8cbbc0456e..6cc63db5c9 100644 --- a/cpp/src/qpid/sys/apr/Thread.h +++ b/cpp/src/qpid/sys/apr/Thread.h @@ -22,8 +22,8 @@ * */ -#include "APRPool.h" -#include "APRBase.h" +#include "qpid/sys/apr/APRPool.h" +#include "qpid/sys/apr/APRBase.h" #include <apr_thread_proc.h> #include <apr_portable.h> diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp b/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp index a7a6e1d02a..454ce62495 100644 --- a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp +++ b/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "CyrusSecurityLayer.h" +#include "qpid/sys/cyrus/CyrusSecurityLayer.h" #include <algorithm> #include "qpid/framing/reply_exceptions.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/cpp/src/qpid/sys/posix/AsynchIO.cpp index 306516de17..5d1ac6d034 100644 --- a/cpp/src/qpid/sys/posix/AsynchIO.cpp +++ b/cpp/src/qpid/sys/posix/AsynchIO.cpp @@ -26,7 +26,7 @@ #include "qpid/sys/Time.h" #include "qpid/log/Statement.h" -#include "check.h" +#include "qpid/sys/posix/check.h" // TODO The basic algorithm here is not really POSIX specific and with a // bit more abstraction could (should) be promoted to be platform portable diff --git a/cpp/src/qpid/sys/posix/Condition.h b/cpp/src/qpid/sys/posix/Condition.h index 62e42c01e9..93aae3ffce 100644 --- a/cpp/src/qpid/sys/posix/Condition.h +++ b/cpp/src/qpid/sys/posix/Condition.h @@ -22,7 +22,7 @@ * */ -#include "PrivatePosix.h" +#include "qpid/sys/posix/PrivatePosix.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/qpid/sys/posix/IOHandle.cpp b/cpp/src/qpid/sys/posix/IOHandle.cpp index 075eb4c335..9c049ee1de 100644 --- a/cpp/src/qpid/sys/posix/IOHandle.cpp +++ b/cpp/src/qpid/sys/posix/IOHandle.cpp @@ -21,7 +21,7 @@ #include "qpid/sys/IOHandle.h" -#include "PrivatePosix.h" +#include "qpid/sys/posix/PrivatePosix.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/posix/LockFile.cpp b/cpp/src/qpid/sys/posix/LockFile.cpp index af9ecd7d66..9ef9a205b7 100755 --- a/cpp/src/qpid/sys/posix/LockFile.cpp +++ b/cpp/src/qpid/sys/posix/LockFile.cpp @@ -24,7 +24,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include "check.h" +#include "qpid/sys/posix/check.h" namespace qpid { namespace sys { diff --git a/cpp/src/qpid/sys/posix/Mutex.h b/cpp/src/qpid/sys/posix/Mutex.h index 564cb72c56..fb8491dec0 100644 --- a/cpp/src/qpid/sys/posix/Mutex.h +++ b/cpp/src/qpid/sys/posix/Mutex.h @@ -19,7 +19,7 @@ * */ -#include "check.h" +#include "qpid/sys/posix/check.h" #include <pthread.h> #include <boost/noncopyable.hpp> diff --git a/cpp/src/qpid/sys/posix/PipeHandle.cpp b/cpp/src/qpid/sys/posix/PipeHandle.cpp index 10e2cdc755..4b19783338 100755 --- a/cpp/src/qpid/sys/posix/PipeHandle.cpp +++ b/cpp/src/qpid/sys/posix/PipeHandle.cpp @@ -18,7 +18,7 @@ // #include "qpid/sys/PipeHandle.h" -#include "check.h" +#include "qpid/sys/posix/check.h" #include <unistd.h> #include <fcntl.h> #include <sys/socket.h> diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp index ab0c28c48c..31044be9ca 100644 --- a/cpp/src/qpid/sys/posix/Socket.cpp +++ b/cpp/src/qpid/sys/posix/Socket.cpp @@ -21,8 +21,8 @@ #include "qpid/sys/Socket.h" -#include "check.h" -#include "PrivatePosix.h" +#include "qpid/sys/posix/check.h" +#include "qpid/sys/posix/PrivatePosix.h" #include <fcntl.h> #include <sys/types.h> diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/cpp/src/qpid/sys/posix/SystemInfo.cpp index f7d16c12c8..55737fcfcc 100755 --- a/cpp/src/qpid/sys/posix/SystemInfo.cpp +++ b/cpp/src/qpid/sys/posix/SystemInfo.cpp @@ -20,7 +20,7 @@ #include "qpid/sys/SystemInfo.h" -#include "check.h" +#include "qpid/sys/posix/check.h" #include <sys/ioctl.h> #include <sys/utsname.h> diff --git a/cpp/src/qpid/sys/posix/Thread.cpp b/cpp/src/qpid/sys/posix/Thread.cpp index bb5641bc53..a784e63195 100644 --- a/cpp/src/qpid/sys/posix/Thread.cpp +++ b/cpp/src/qpid/sys/posix/Thread.cpp @@ -22,7 +22,7 @@ #include "qpid/sys/Thread.h" #include "qpid/sys/Runnable.h" -#include "check.h" +#include "qpid/sys/posix/check.h" #include <pthread.h> diff --git a/cpp/src/qpid/sys/posix/Time.cpp b/cpp/src/qpid/sys/posix/Time.cpp index bd1863f860..0734abd1df 100644 --- a/cpp/src/qpid/sys/posix/Time.cpp +++ b/cpp/src/qpid/sys/posix/Time.cpp @@ -19,7 +19,7 @@ * */ -#include "PrivatePosix.h" +#include "qpid/sys/posix/PrivatePosix.h" #include "qpid/sys/Time.h" #include <ostream> diff --git a/cpp/src/qpid/sys/rdma/RdmaClient.cpp b/cpp/src/qpid/sys/rdma/RdmaClient.cpp index 0d3dd83131..52208d0519 100644 --- a/cpp/src/qpid/sys/rdma/RdmaClient.cpp +++ b/cpp/src/qpid/sys/rdma/RdmaClient.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RdmaIO.h" +#include "qpid/sys/rdma/RdmaIO.h" #include "qpid/sys/Time.h" #include <netdb.h> diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp index 316b6b99e3..491c1612fd 100644 --- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp +++ b/cpp/src/qpid/sys/rdma/RdmaIO.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RdmaIO.h" +#include "qpid/sys/rdma/RdmaIO.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/cpp/src/qpid/sys/rdma/RdmaIO.h index 9f916ba7e2..697d9387ce 100644 --- a/cpp/src/qpid/sys/rdma/RdmaIO.h +++ b/cpp/src/qpid/sys/rdma/RdmaIO.h @@ -21,7 +21,7 @@ #ifndef Rdma_Acceptor_h #define Rdma_Acceptor_h -#include "rdma_wrap.h" +#include "qpid/sys/rdma/rdma_wrap.h" #include "qpid/sys/AtomicValue.h" #include "qpid/sys/Dispatcher.h" diff --git a/cpp/src/qpid/sys/rdma/RdmaServer.cpp b/cpp/src/qpid/sys/rdma/RdmaServer.cpp index 594578a265..1ab5268596 100644 --- a/cpp/src/qpid/sys/rdma/RdmaServer.cpp +++ b/cpp/src/qpid/sys/rdma/RdmaServer.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "RdmaIO.h" +#include "qpid/sys/rdma/RdmaIO.h" #include <arpa/inet.h> diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.cpp b/cpp/src/qpid/sys/rdma/rdma_factories.cpp index c6e8df814b..a5e9ebd23c 100644 --- a/cpp/src/qpid/sys/rdma/rdma_factories.cpp +++ b/cpp/src/qpid/sys/rdma/rdma_factories.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "rdma_factories.h" +#include "qpid/sys/rdma/rdma_factories.h" namespace Rdma { void acker(::rdma_cm_event* e) throw () { diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.h b/cpp/src/qpid/sys/rdma/rdma_factories.h index 8d024f37aa..783181cf1b 100644 --- a/cpp/src/qpid/sys/rdma/rdma_factories.h +++ b/cpp/src/qpid/sys/rdma/rdma_factories.h @@ -21,7 +21,7 @@ #ifndef RDMA_FACTORIES_H #define RDMA_FACTORIES_H -#include "rdma_exception.h" +#include "qpid/sys/rdma/rdma_exception.h" #include <rdma/rdma_cma.h> diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp b/cpp/src/qpid/sys/rdma/rdma_wrap.cpp index 4fcb8ca2fa..53e31ca766 100644 --- a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp +++ b/cpp/src/qpid/sys/rdma/rdma_wrap.cpp @@ -19,7 +19,7 @@ * */ -#include "rdma_wrap.h" +#include "qpid/sys/rdma/rdma_wrap.h" namespace Rdma { const ::rdma_conn_param DEFAULT_CONNECT_PARAM = { diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.h b/cpp/src/qpid/sys/rdma/rdma_wrap.h index 7812a02532..aa2e516e6b 100644 --- a/cpp/src/qpid/sys/rdma/rdma_wrap.h +++ b/cpp/src/qpid/sys/rdma/rdma_wrap.h @@ -21,7 +21,7 @@ #ifndef RDMA_WRAP_H #define RDMA_WRAP_H -#include "rdma_factories.h" +#include "qpid/sys/rdma/rdma_factories.h" #include <rdma/rdma_cma.h> diff --git a/cpp/src/qpid/sys/ssl/SslHandler.cpp b/cpp/src/qpid/sys/ssl/SslHandler.cpp index 282c3ce8c8..9cf74e4b6d 100644 --- a/cpp/src/qpid/sys/ssl/SslHandler.cpp +++ b/cpp/src/qpid/sys/ssl/SslHandler.cpp @@ -18,10 +18,10 @@ * under the License. * */ -#include "SslHandler.h" +#include "qpid/sys/ssl/SslHandler.h" -#include "SslIo.h" -#include "SslSocket.h" +#include "qpid/sys/ssl/SslIo.h" +#include "qpid/sys/ssl/SslSocket.h" #include "qpid/framing/AMQP_HighestVersion.h" #include "qpid/framing/ProtocolInitiation.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/sys/ssl/SslIo.cpp b/cpp/src/qpid/sys/ssl/SslIo.cpp index caf190a5ac..282d77258f 100644 --- a/cpp/src/qpid/sys/ssl/SslIo.cpp +++ b/cpp/src/qpid/sys/ssl/SslIo.cpp @@ -19,8 +19,8 @@ * */ -#include "SslIo.h" -#include "SslSocket.h" +#include "qpid/sys/ssl/SslIo.h" +#include "qpid/sys/ssl/SslSocket.h" #include "qpid/sys/Time.h" #include "qpid/sys/posix/check.h" diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/cpp/src/qpid/sys/ssl/SslSocket.cpp index 21ec8f7216..9181f56b94 100644 --- a/cpp/src/qpid/sys/ssl/SslSocket.cpp +++ b/cpp/src/qpid/sys/ssl/SslSocket.cpp @@ -19,9 +19,9 @@ * */ -#include "SslSocket.h" -#include "check.h" -#include "util.h" +#include "qpid/sys/ssl/SslSocket.h" +#include "qpid/sys/ssl/check.h" +#include "qpid/sys/ssl/util.h" #include "qpid/Exception.h" #include "qpid/sys/posix/check.h" #include "qpid/sys/posix/PrivatePosix.h" diff --git a/cpp/src/qpid/sys/ssl/check.cpp b/cpp/src/qpid/sys/ssl/check.cpp index b580e9bcf5..06d225cf44 100644 --- a/cpp/src/qpid/sys/ssl/check.cpp +++ b/cpp/src/qpid/sys/ssl/check.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "check.h" +#include "qpid/sys/ssl/check.h" #include <nss3/secerr.h> #include <nss3/sslerr.h> #include <boost/format.hpp> diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/cpp/src/qpid/sys/ssl/util.cpp index 263f596aeb..53326e2f55 100644 --- a/cpp/src/qpid/sys/ssl/util.cpp +++ b/cpp/src/qpid/sys/ssl/util.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "util.h" -#include "check.h" +#include "qpid/sys/ssl/util.h" +#include "qpid/sys/ssl/check.h" #include "qpid/Exception.h" #include "qpid/sys/SystemInfo.h" diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/cpp/src/qpid/sys/windows/AsynchIO.cpp index 8de2eccc84..dcd2f71a65 100644 --- a/cpp/src/qpid/sys/windows/AsynchIO.cpp +++ b/cpp/src/qpid/sys/windows/AsynchIO.cpp @@ -19,8 +19,8 @@ * */ -#include "AsynchIoResult.h" -#include "IoHandlePrivate.h" +#include "qpid/sys/windows/AsynchIoResult.h" +#include "qpid/sys/windows/IoHandlePrivate.h" #include "qpid/sys/AsynchIO.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/Socket.h" @@ -29,7 +29,7 @@ #include "qpid/sys/Time.h" #include "qpid/log/Statement.h" -#include "check.h" +#include "qpid/sys/windows/check.h" #include <boost/thread/once.hpp> diff --git a/cpp/src/qpid/sys/windows/IOHandle.cpp b/cpp/src/qpid/sys/windows/IOHandle.cpp index ba544c8c90..250737cb99 100755 --- a/cpp/src/qpid/sys/windows/IOHandle.cpp +++ b/cpp/src/qpid/sys/windows/IOHandle.cpp @@ -20,7 +20,7 @@ */ #include "qpid/sys/IOHandle.h" -#include "IoHandlePrivate.h" +#include "qpid/sys/windows/IoHandlePrivate.h" #include <windows.h> namespace qpid { diff --git a/cpp/src/qpid/sys/windows/IoHandlePrivate.h b/cpp/src/qpid/sys/windows/IoHandlePrivate.h index cd89f39292..1bb0f7aa2e 100755 --- a/cpp/src/qpid/sys/windows/IoHandlePrivate.h +++ b/cpp/src/qpid/sys/windows/IoHandlePrivate.h @@ -22,7 +22,7 @@ * */ -#include "AsynchIoResult.h" +#include "qpid/sys/windows/AsynchIoResult.h" #include "qpid/CommonImportExport.h" #include <winsock2.h> diff --git a/cpp/src/qpid/sys/windows/IocpPoller.cpp b/cpp/src/qpid/sys/windows/IocpPoller.cpp index 467ef8facb..3943fd82cd 100755 --- a/cpp/src/qpid/sys/windows/IocpPoller.cpp +++ b/cpp/src/qpid/sys/windows/IocpPoller.cpp @@ -23,9 +23,9 @@ #include "qpid/sys/Mutex.h" #include "qpid/sys/Dispatcher.h" -#include "AsynchIoResult.h" -#include "IoHandlePrivate.h" -#include "check.h" +#include "qpid/sys/windows/AsynchIoResult.h" +#include "qpid/sys/windows/IoHandlePrivate.h" +#include "qpid/sys/windows/check.h" #include <winsock2.h> #include <windows.h> diff --git a/cpp/src/qpid/sys/windows/LockFile.cpp b/cpp/src/qpid/sys/windows/LockFile.cpp index 766fa6466a..6cc710a3df 100755 --- a/cpp/src/qpid/sys/windows/LockFile.cpp +++ b/cpp/src/qpid/sys/windows/LockFile.cpp @@ -17,7 +17,7 @@ */ #include "qpid/sys/LockFile.h" -#include "check.h" +#include "qpid/sys/windows/check.h" #include <windows.h> diff --git a/cpp/src/qpid/sys/windows/Mutex.h b/cpp/src/qpid/sys/windows/Mutex.h index b8d34de6d1..12768640d5 100755 --- a/cpp/src/qpid/sys/windows/Mutex.h +++ b/cpp/src/qpid/sys/windows/Mutex.h @@ -19,7 +19,7 @@ * */ -#include "check.h" +#include "qpid/sys/windows/check.h" #include <boost/version.hpp> #if (BOOST_VERSION < 103500) diff --git a/cpp/src/qpid/sys/windows/PipeHandle.cpp b/cpp/src/qpid/sys/windows/PipeHandle.cpp index b023d77cc0..e2cbff3908 100755 --- a/cpp/src/qpid/sys/windows/PipeHandle.cpp +++ b/cpp/src/qpid/sys/windows/PipeHandle.cpp @@ -18,7 +18,7 @@ // #include "qpid/sys/PipeHandle.h" -#include "check.h" +#include "qpid/sys/windows/check.h" #include <io.h> #include <fcntl.h> #include <errno.h> diff --git a/cpp/src/qpid/sys/windows/PollableCondition.cpp b/cpp/src/qpid/sys/windows/PollableCondition.cpp index 2ba9067094..e49b6ceb0c 100644 --- a/cpp/src/qpid/sys/windows/PollableCondition.cpp +++ b/cpp/src/qpid/sys/windows/PollableCondition.cpp @@ -24,8 +24,8 @@ #include "qpid/sys/PollableCondition.h" #include "qpid/sys/IOHandle.h" -#include "AsynchIoResult.h" -#include "IoHandlePrivate.h" +#include "qpid/sys/windows/AsynchIoResult.h" +#include "qpid/sys/windows/IoHandlePrivate.h" #include <boost/bind.hpp> #include <windows.h> diff --git a/cpp/src/qpid/sys/windows/Socket.cpp b/cpp/src/qpid/sys/windows/Socket.cpp index 93059d03ef..18fa7c3b1c 100755 --- a/cpp/src/qpid/sys/windows/Socket.cpp +++ b/cpp/src/qpid/sys/windows/Socket.cpp @@ -20,8 +20,8 @@ */ #include "qpid/sys/Socket.h" -#include "IoHandlePrivate.h" -#include "check.h" +#include "qpid/sys/windows/IoHandlePrivate.h" +#include "qpid/sys/windows/check.h" #include "qpid/sys/Time.h" #include <cstdlib> diff --git a/cpp/src/qpid/sys/windows/Thread.cpp b/cpp/src/qpid/sys/windows/Thread.cpp index 6d5d78393e..fed82e4d54 100755 --- a/cpp/src/qpid/sys/windows/Thread.cpp +++ b/cpp/src/qpid/sys/windows/Thread.cpp @@ -21,7 +21,7 @@ #include "qpid/sys/Thread.h" #include "qpid/sys/Runnable.h" -#include "check.h" +#include "qpid/sys/windows/check.h" #include <process.h> #include <windows.h> diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/cpp/src/qpid/sys/windows/uuid.cpp index 4d8184c703..6ff3a3cb8a 100644 --- a/cpp/src/qpid/sys/windows/uuid.cpp +++ b/cpp/src/qpid/sys/windows/uuid.cpp @@ -24,7 +24,7 @@ # undef uuid_t #endif -#include "uuid.h" +#include "qpid/sys/windows/uuid.h" #include <string.h> diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/cpp/src/qpid/xml/XmlExchange.cpp index f17a11f08b..a41c8840ff 100644 --- a/cpp/src/qpid/xml/XmlExchange.cpp +++ b/cpp/src/qpid/xml/XmlExchange.cpp @@ -21,7 +21,7 @@ #include "config.h" -#include "XmlExchange.h" +#include "qpid/xml/XmlExchange.h" #include "qpid/broker/DeliverableMessage.h" diff --git a/cpp/src/qpid/xml/XmlExchangePlugin.cpp b/cpp/src/qpid/xml/XmlExchangePlugin.cpp index 8f2d127424..742b878e86 100644 --- a/cpp/src/qpid/xml/XmlExchangePlugin.cpp +++ b/cpp/src/qpid/xml/XmlExchangePlugin.cpp @@ -25,7 +25,7 @@ #include <boost/shared_ptr.hpp> #include <boost/utility/in_place_factory.hpp> -#include "XmlExchange.h" +#include "qpid/xml/XmlExchange.h" namespace qpid { namespace broker { // ACL uses the acl namespace here - should I? diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp index 330f12ae83..9c3c6b0c4b 100644 --- a/cpp/src/qpidd.cpp +++ b/cpp/src/qpidd.cpp @@ -19,7 +19,7 @@ * */ -#include "qpidd.h" +#include "./qpidd.h" #include "qpid/Plugin.h" #include "qpid/Version.h" #include "qpid/log/Logger.h" diff --git a/cpp/src/tests/AccumulatedAckTest.cpp b/cpp/src/tests/AccumulatedAckTest.cpp index 028ce71907..c7470c8b97 100644 --- a/cpp/src/tests/AccumulatedAckTest.cpp +++ b/cpp/src/tests/AccumulatedAckTest.cpp @@ -20,7 +20,7 @@ * */ #include "qpid/framing/AccumulatedAck.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <list> diff --git a/cpp/src/tests/Array.cpp b/cpp/src/tests/Array.cpp index c779cbe901..13b3541089 100644 --- a/cpp/src/tests/Array.cpp +++ b/cpp/src/tests/Array.cpp @@ -23,7 +23,7 @@ #include "qpid/framing/Array.h" #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ArrayTestSuite) diff --git a/cpp/src/tests/AsyncCompletion.cpp b/cpp/src/tests/AsyncCompletion.cpp index 41423d8245..30118d8ffd 100644 --- a/cpp/src/tests/AsyncCompletion.cpp +++ b/cpp/src/tests/AsyncCompletion.cpp @@ -17,9 +17,9 @@ */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/broker/NullMessageStore.h" #include "qpid/sys/BlockingQueue.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/AtomicValue.cpp b/cpp/src/tests/AtomicValue.cpp index 05083ad177..262b3637c6 100644 --- a/cpp/src/tests/AtomicValue.cpp +++ b/cpp/src/tests/AtomicValue.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/sys/AtomicValue.h" QPID_AUTO_TEST_SUITE(AtomicValueTestSuite) diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h index 397045d00b..efd5cd5d44 100644 --- a/cpp/src/tests/BrokerFixture.h +++ b/cpp/src/tests/BrokerFixture.h @@ -22,7 +22,7 @@ * */ -#include "SocketProxy.h" +#include "tests/SocketProxy.h" #include "qpid/broker/Broker.h" #include "qpid/client/Connection.h" diff --git a/cpp/src/tests/ClientMessageTest.cpp b/cpp/src/tests/ClientMessageTest.cpp index bc0945674f..ed6fca23f5 100644 --- a/cpp/src/tests/ClientMessageTest.cpp +++ b/cpp/src/tests/ClientMessageTest.cpp @@ -19,7 +19,7 @@ /**@file Unit tests for the client::Message class. */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/client/Message.h" using namespace qpid::client; diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp index 3ed7491f7d..0adf6ccc27 100644 --- a/cpp/src/tests/ClientSessionTest.cpp +++ b/cpp/src/tests/ClientSessionTest.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/client/QueueOptions.h" #include "qpid/client/MessageListener.h" #include "qpid/client/SubscriptionManager.h" diff --git a/cpp/src/tests/ClusterFailover.cpp b/cpp/src/tests/ClusterFailover.cpp index 9ce9c4a36b..5eb7d824fd 100644 --- a/cpp/src/tests/ClusterFailover.cpp +++ b/cpp/src/tests/ClusterFailover.cpp @@ -24,9 +24,9 @@ * In this case the failed nodes must shut down. */ -#include "test_tools.h" -#include "unit_test.h" -#include "ClusterFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ClusterFixture.h" #include "qpid/client/FailoverManager.h" #include <boost/assign.hpp> #include <boost/algorithm/string.hpp> diff --git a/cpp/src/tests/ClusterFixture.cpp b/cpp/src/tests/ClusterFixture.cpp index e12106c464..d9cf909a5c 100644 --- a/cpp/src/tests/ClusterFixture.cpp +++ b/cpp/src/tests/ClusterFixture.cpp @@ -16,10 +16,10 @@ * */ -#include "test_tools.h" -#include "unit_test.h" -#include "ForkedBroker.h" -#include "BrokerFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ForkedBroker.h" +#include "tests/BrokerFixture.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionAccess.h" @@ -59,7 +59,7 @@ using qpid::cluster::Cluster; using boost::assign::list_of; -#include "ClusterFixture.h" +#include "tests/ClusterFixture.h" ClusterFixture::ClusterFixture(size_t n, const Args& args_, int localIndex_) : name(Uuid(true).str()), localIndex(localIndex_), userArgs(args_) diff --git a/cpp/src/tests/ClusterFixture.h b/cpp/src/tests/ClusterFixture.h index 08b314499e..a05a83ddd6 100644 --- a/cpp/src/tests/ClusterFixture.h +++ b/cpp/src/tests/ClusterFixture.h @@ -19,10 +19,10 @@ * */ -#include "test_tools.h" -#include "unit_test.h" -#include "ForkedBroker.h" -#include "BrokerFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ForkedBroker.h" +#include "tests/BrokerFixture.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionAccess.h" diff --git a/cpp/src/tests/ConsoleTest.cpp b/cpp/src/tests/ConsoleTest.cpp index 1d55b13f3c..30dbf4bd1d 100644 --- a/cpp/src/tests/ConsoleTest.cpp +++ b/cpp/src/tests/ConsoleTest.cpp @@ -21,7 +21,7 @@ #include "qpid/console/Package.h" #include "qpid/console/ClassKey.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ConsoleTestSuite) diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/cpp/src/tests/DeliveryRecordTest.cpp index 8ff7ad3584..f99219b9d6 100644 --- a/cpp/src/tests/DeliveryRecordTest.cpp +++ b/cpp/src/tests/DeliveryRecordTest.cpp @@ -20,7 +20,7 @@ * */ #include "qpid/broker/DeliveryRecord.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <memory> #include <boost/format.hpp> diff --git a/cpp/src/tests/DtxWorkRecordTest.cpp b/cpp/src/tests/DtxWorkRecordTest.cpp index c7c1b460ff..9095f968b1 100644 --- a/cpp/src/tests/DtxWorkRecordTest.cpp +++ b/cpp/src/tests/DtxWorkRecordTest.cpp @@ -19,10 +19,10 @@ * */ #include "qpid/broker/DtxWorkRecord.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <vector> -#include "TxMocks.h" +#include "tests/TxMocks.h" using namespace qpid::broker; using boost::static_pointer_cast; diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp index 2100fb5ed7..68d681ea3b 100644 --- a/cpp/src/tests/ExchangeTest.cpp +++ b/cpp/src/tests/ExchangeTest.cpp @@ -29,9 +29,9 @@ #include "qpid/broker/HeadersExchange.h" #include "qpid/broker/TopicExchange.h" #include "qpid/framing/reply_exceptions.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> -#include "MessageUtils.h" +#include "tests/MessageUtils.h" using boost::intrusive_ptr; using namespace qpid::broker; diff --git a/cpp/src/tests/FieldTable.cpp b/cpp/src/tests/FieldTable.cpp index a02bbd5194..4a74b4560f 100644 --- a/cpp/src/tests/FieldTable.cpp +++ b/cpp/src/tests/FieldTable.cpp @@ -24,7 +24,7 @@ #include "qpid/framing/FieldValue.h" #include "qpid/sys/alloca.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::framing; diff --git a/cpp/src/tests/FieldValue.cpp b/cpp/src/tests/FieldValue.cpp index 448f068107..235a4876b8 100644 --- a/cpp/src/tests/FieldValue.cpp +++ b/cpp/src/tests/FieldValue.cpp @@ -18,7 +18,7 @@ */ #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(FieldValueTestSuite) diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp index ee29926ff8..6f914477ff 100644 --- a/cpp/src/tests/ForkedBroker.cpp +++ b/cpp/src/tests/ForkedBroker.cpp @@ -19,7 +19,7 @@ * */ -#include "ForkedBroker.h" +#include "tests/ForkedBroker.h" #include "qpid/log/Statement.h" #include <boost/bind.hpp> #include <algorithm> diff --git a/cpp/src/tests/Frame.cpp b/cpp/src/tests/Frame.cpp index 11905911fa..15fbaf137b 100644 --- a/cpp/src/tests/Frame.cpp +++ b/cpp/src/tests/Frame.cpp @@ -21,7 +21,7 @@ #include "qpid/framing/Frame.h" #include <boost/lexical_cast.hpp> -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(FrameTestSuite) diff --git a/cpp/src/tests/FrameDecoder.cpp b/cpp/src/tests/FrameDecoder.cpp index f5db66d5fe..2d4e4c6f19 100644 --- a/cpp/src/tests/FrameDecoder.cpp +++ b/cpp/src/tests/FrameDecoder.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/FrameDecoder.h" #include "qpid/framing/AMQContentBody.h" diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp index e09ee19bc2..04c273d8a2 100644 --- a/cpp/src/tests/FramingTest.cpp +++ b/cpp/src/tests/FramingTest.cpp @@ -25,7 +25,7 @@ #include "qpid/framing/all_method_bodies.h" #include "qpid/framing/amqp_framing.h" #include "qpid/framing/reply_exceptions.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <boost/bind.hpp> #include <boost/lexical_cast.hpp> diff --git a/cpp/src/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp index 01e7c22ee6..ece842fe0e 100644 --- a/cpp/src/tests/HeaderTest.cpp +++ b/cpp/src/tests/HeaderTest.cpp @@ -21,7 +21,7 @@ #include <iostream> #include "qpid/framing/amqp_framing.h" #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::framing; using namespace std; diff --git a/cpp/src/tests/HeadersExchangeTest.cpp b/cpp/src/tests/HeadersExchangeTest.cpp index 46933f955a..030f3a2221 100644 --- a/cpp/src/tests/HeadersExchangeTest.cpp +++ b/cpp/src/tests/HeadersExchangeTest.cpp @@ -23,7 +23,7 @@ #include "qpid/broker/HeadersExchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::broker; using namespace qpid::framing; diff --git a/cpp/src/tests/IncompleteMessageList.cpp b/cpp/src/tests/IncompleteMessageList.cpp index e830df0e8b..d7134ef2db 100644 --- a/cpp/src/tests/IncompleteMessageList.cpp +++ b/cpp/src/tests/IncompleteMessageList.cpp @@ -25,7 +25,7 @@ #include "qpid/broker/Queue.h" #include "qpid/broker/IncompleteMessageList.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(IncompleteMessageListTestSuite) diff --git a/cpp/src/tests/InlineAllocator.cpp b/cpp/src/tests/InlineAllocator.cpp index fe6eaefaf4..6106c633c9 100644 --- a/cpp/src/tests/InlineAllocator.cpp +++ b/cpp/src/tests/InlineAllocator.cpp @@ -20,7 +20,7 @@ */ #include "qpid/InlineAllocator.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(InlineAllocatorTestSuite) diff --git a/cpp/src/tests/InlineVector.cpp b/cpp/src/tests/InlineVector.cpp index 009f10af9d..98a2a36236 100644 --- a/cpp/src/tests/InlineVector.cpp +++ b/cpp/src/tests/InlineVector.cpp @@ -20,7 +20,7 @@ */ #include "qpid/InlineVector.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(InlineVectorTestSuite) diff --git a/cpp/src/tests/ManagementTest.cpp b/cpp/src/tests/ManagementTest.cpp index e6f2e2e3fd..e99a799f37 100644 --- a/cpp/src/tests/ManagementTest.cpp +++ b/cpp/src/tests/ManagementTest.cpp @@ -22,7 +22,7 @@ #include "qpid/management/ManagementObject.h" #include "qpid/framing/Buffer.h" #include "qpid/console/ObjectId.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ManagementTestSuite) diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp index 1f3f830633..f04d16155d 100644 --- a/cpp/src/tests/MessageBuilderTest.cpp +++ b/cpp/src/tests/MessageBuilderTest.cpp @@ -24,7 +24,7 @@ #include "qpid/framing/frame_functors.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/TypeFilter.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <list> using namespace qpid::broker; diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/cpp/src/tests/MessageReplayTracker.cpp index a5121cdeb7..2a0e74291b 100644 --- a/cpp/src/tests/MessageReplayTracker.cpp +++ b/cpp/src/tests/MessageReplayTracker.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "unit_test.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/BrokerFixture.h" #include "qpid/client/MessageReplayTracker.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp index cd63f64a37..066ba006e5 100644 --- a/cpp/src/tests/MessageTest.cpp +++ b/cpp/src/tests/MessageTest.cpp @@ -26,7 +26,7 @@ #include "qpid/framing/Uuid.h" #include "qpid/sys/alloca.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> diff --git a/cpp/src/tests/PartialFailure.cpp b/cpp/src/tests/PartialFailure.cpp index 7169e53a16..d6361bd215 100644 --- a/cpp/src/tests/PartialFailure.cpp +++ b/cpp/src/tests/PartialFailure.cpp @@ -24,9 +24,9 @@ * In this case the failed nodes must shut down. */ -#include "test_tools.h" -#include "unit_test.h" -#include "ClusterFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ClusterFixture.h" #include <boost/assign.hpp> #include <boost/algorithm/string.hpp> #include <boost/bind.hpp> diff --git a/cpp/src/tests/PollableCondition.cpp b/cpp/src/tests/PollableCondition.cpp index b5cf1b4cd2..acc6b6f0ec 100644 --- a/cpp/src/tests/PollableCondition.cpp +++ b/cpp/src/tests/PollableCondition.cpp @@ -19,8 +19,8 @@ * */ -#include "test_tools.h" -#include "unit_test.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" #include "qpid/sys/Poller.h" #include "qpid/sys/PollableCondition.h" #include "qpid/sys/Monitor.h" diff --git a/cpp/src/tests/ProxyTest.cpp b/cpp/src/tests/ProxyTest.cpp index 4ea10f7be9..ce5cc5abd6 100644 --- a/cpp/src/tests/ProxyTest.cpp +++ b/cpp/src/tests/ProxyTest.cpp @@ -24,7 +24,7 @@ #include "qpid/framing/ExecutionSyncBody.h" #include "qpid/framing/Proxy.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::framing; diff --git a/cpp/src/tests/QueueEvents.cpp b/cpp/src/tests/QueueEvents.cpp index cd9439355e..3f9e1239f2 100644 --- a/cpp/src/tests/QueueEvents.cpp +++ b/cpp/src/tests/QueueEvents.cpp @@ -19,9 +19,9 @@ * */ -#include "MessageUtils.h" -#include "unit_test.h" -#include "BrokerFixture.h" +#include "tests/MessageUtils.h" +#include "tests/unit_test.h" +#include "tests/BrokerFixture.h" #include "qpid/broker/Message.h" #include "qpid/broker/Queue.h" #include "qpid/broker/QueueEvents.h" diff --git a/cpp/src/tests/QueueOptionsTest.cpp b/cpp/src/tests/QueueOptionsTest.cpp index 93d1961caa..740c59b2e0 100644 --- a/cpp/src/tests/QueueOptionsTest.cpp +++ b/cpp/src/tests/QueueOptionsTest.cpp @@ -22,7 +22,7 @@ #include "qpid/framing/Array.h" #include "qpid/client/QueueOptions.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::client; diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/cpp/src/tests/QueuePolicyTest.cpp index 7c7f8b7a10..33d9fefcfe 100644 --- a/cpp/src/tests/QueuePolicyTest.cpp +++ b/cpp/src/tests/QueuePolicyTest.cpp @@ -18,15 +18,15 @@ * under the License. * */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/broker/QueuePolicy.h" #include "qpid/client/QueueOptions.h" #include "qpid/sys/Time.h" #include "qpid/framing/reply_exceptions.h" -#include "MessageUtils.h" -#include "BrokerFixture.h" +#include "tests/MessageUtils.h" +#include "tests/BrokerFixture.h" using namespace qpid::broker; using namespace qpid::client; diff --git a/cpp/src/tests/QueueRegistryTest.cpp b/cpp/src/tests/QueueRegistryTest.cpp index 7ad4e0b89d..2194db5201 100644 --- a/cpp/src/tests/QueueRegistryTest.cpp +++ b/cpp/src/tests/QueueRegistryTest.cpp @@ -18,7 +18,7 @@ */ #include "qpid/broker/QueueRegistry.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <string> using namespace qpid::broker; diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp index be4a87d2ab..85bfcd3c06 100644 --- a/cpp/src/tests/QueueTest.cpp +++ b/cpp/src/tests/QueueTest.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/Exception.h" #include "qpid/broker/Broker.h" #include "qpid/broker/Queue.h" diff --git a/cpp/src/tests/RangeSet.cpp b/cpp/src/tests/RangeSet.cpp index 9c602de78d..4c5760f697 100644 --- a/cpp/src/tests/RangeSet.cpp +++ b/cpp/src/tests/RangeSet.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/RangeSet.h" using namespace std; diff --git a/cpp/src/tests/RateFlowcontrolTest.cpp b/cpp/src/tests/RateFlowcontrolTest.cpp index b8fda09f61..9f6aeea4c7 100644 --- a/cpp/src/tests/RateFlowcontrolTest.cpp +++ b/cpp/src/tests/RateFlowcontrolTest.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/broker/RateFlowcontrol.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/tests/RefCounted.cpp b/cpp/src/tests/RefCounted.cpp index 8c679a3d2e..e9d90cb462 100644 --- a/cpp/src/tests/RefCounted.cpp +++ b/cpp/src/tests/RefCounted.cpp @@ -19,7 +19,7 @@ #include "qpid/RefCounted.h" #include <boost/intrusive_ptr.hpp> -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(RefCountedTestSuiteTestSuite) diff --git a/cpp/src/tests/ReplicationTest.cpp b/cpp/src/tests/ReplicationTest.cpp index 38dc1a9e52..38369640a9 100644 --- a/cpp/src/tests/ReplicationTest.cpp +++ b/cpp/src/tests/ReplicationTest.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/Plugin.h" #include "qpid/broker/Broker.h" diff --git a/cpp/src/tests/RetryList.cpp b/cpp/src/tests/RetryList.cpp index 80f59bf15f..55d27c947c 100644 --- a/cpp/src/tests/RetryList.cpp +++ b/cpp/src/tests/RetryList.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/broker/RetryList.h" using namespace qpid; diff --git a/cpp/src/tests/SequenceNumberTest.cpp b/cpp/src/tests/SequenceNumberTest.cpp index e4c6d066ef..87d5d6baeb 100644 --- a/cpp/src/tests/SequenceNumberTest.cpp +++ b/cpp/src/tests/SequenceNumberTest.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include "qpid/framing/SequenceNumber.h" #include "qpid/framing/SequenceNumberSet.h" diff --git a/cpp/src/tests/SequenceSet.cpp b/cpp/src/tests/SequenceSet.cpp index ba2f1391a1..3039b126d6 100644 --- a/cpp/src/tests/SequenceSet.cpp +++ b/cpp/src/tests/SequenceSet.cpp @@ -17,7 +17,7 @@ */ #include "qpid/framing/SequenceSet.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <list> QPID_AUTO_TEST_SUITE(SequenceSetTestSuite) diff --git a/cpp/src/tests/SessionState.cpp b/cpp/src/tests/SessionState.cpp index 5e21ff2b70..41010d7ef3 100644 --- a/cpp/src/tests/SessionState.cpp +++ b/cpp/src/tests/SessionState.cpp @@ -16,7 +16,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/SessionState.h" #include "qpid/Exception.h" diff --git a/cpp/src/tests/Shlib.cpp b/cpp/src/tests/Shlib.cpp index 7d2f2456c7..3465b0f27e 100644 --- a/cpp/src/tests/Shlib.cpp +++ b/cpp/src/tests/Shlib.cpp @@ -18,11 +18,11 @@ * */ -#include "test_tools.h" +#include "tests/test_tools.h" #include "qpid/sys/Shlib.h" #include "qpid/Exception.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ShlibTestSuite) diff --git a/cpp/src/tests/StringUtils.cpp b/cpp/src/tests/StringUtils.cpp index 6a19119288..6755b3d62a 100644 --- a/cpp/src/tests/StringUtils.cpp +++ b/cpp/src/tests/StringUtils.cpp @@ -21,7 +21,7 @@ #include <iostream> #include "qpid/StringUtils.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(StringUtilsTestSuite) diff --git a/cpp/src/tests/TestOptions.h b/cpp/src/tests/TestOptions.h index a400fe5ecb..758eef99f1 100644 --- a/cpp/src/tests/TestOptions.h +++ b/cpp/src/tests/TestOptions.h @@ -26,7 +26,7 @@ #include "qpid/Url.h" #include "qpid/log/Logger.h" #include "qpid/client/Connection.h" -#include "ConnectionOptions.h" +#include "tests/ConnectionOptions.h" #include <iostream> #include <exception> diff --git a/cpp/src/tests/TimerTest.cpp b/cpp/src/tests/TimerTest.cpp index f8ab9fb2f3..0bf29eeac1 100644 --- a/cpp/src/tests/TimerTest.cpp +++ b/cpp/src/tests/TimerTest.cpp @@ -21,7 +21,7 @@ */ #include "qpid/broker/Timer.h" #include "qpid/sys/Monitor.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <math.h> #include <iostream> #include <memory> diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/cpp/src/tests/TopicExchangeTest.cpp index d707066534..ae22df1d44 100644 --- a/cpp/src/tests/TopicExchangeTest.cpp +++ b/cpp/src/tests/TopicExchangeTest.cpp @@ -17,8 +17,8 @@ * under the License. */ #include "qpid/broker/TopicExchange.h" -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" using namespace qpid::broker; using namespace std; diff --git a/cpp/src/tests/TxBufferTest.cpp b/cpp/src/tests/TxBufferTest.cpp index 3d6a12cacc..095827e45e 100644 --- a/cpp/src/tests/TxBufferTest.cpp +++ b/cpp/src/tests/TxBufferTest.cpp @@ -19,10 +19,10 @@ * */ #include "qpid/broker/TxBuffer.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <vector> -#include "TxMocks.h" +#include "tests/TxMocks.h" using namespace qpid::broker; using boost::static_pointer_cast; diff --git a/cpp/src/tests/TxPublishTest.cpp b/cpp/src/tests/TxPublishTest.cpp index 63dbf99266..d29c23e005 100644 --- a/cpp/src/tests/TxPublishTest.cpp +++ b/cpp/src/tests/TxPublishTest.cpp @@ -21,12 +21,12 @@ #include "qpid/broker/NullMessageStore.h" #include "qpid/broker/RecoveryManager.h" #include "qpid/broker/TxPublish.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <list> #include <vector> -#include "MessageUtils.h" -#include "TestMessageStore.h" +#include "tests/MessageUtils.h" +#include "tests/TestMessageStore.h" using std::list; using std::pair; diff --git a/cpp/src/tests/Url.cpp b/cpp/src/tests/Url.cpp index f3b42a7208..f8c347cb79 100644 --- a/cpp/src/tests/Url.cpp +++ b/cpp/src/tests/Url.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/Url.h" #include <boost/assign.hpp> diff --git a/cpp/src/tests/Uuid.cpp b/cpp/src/tests/Uuid.cpp index ea2e80b63b..57946f9eb4 100644 --- a/cpp/src/tests/Uuid.cpp +++ b/cpp/src/tests/Uuid.cpp @@ -20,7 +20,7 @@ #include "qpid/framing/Buffer.h" #include "qpid/sys/alloca.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <set> diff --git a/cpp/src/tests/XmlClientSessionTest.cpp b/cpp/src/tests/XmlClientSessionTest.cpp index b6b8520bd8..368b539f23 100644 --- a/cpp/src/tests/XmlClientSessionTest.cpp +++ b/cpp/src/tests/XmlClientSessionTest.cpp @@ -19,9 +19,9 @@ * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/sys/Shlib.h" #include "qpid/sys/Monitor.h" #include "qpid/sys/Thread.h" diff --git a/cpp/src/tests/ais_test.cpp b/cpp/src/tests/ais_test.cpp index 00c61242e4..66b46a9116 100644 --- a/cpp/src/tests/ais_test.cpp +++ b/cpp/src/tests/ais_test.cpp @@ -19,5 +19,5 @@ // Defines test_main function to link with actual unit test code. #define BOOST_AUTO_TEST_MAIN // Boost 1.33 #define BOOST_TEST_MAIN -#include "unit_test.h" +#include "tests/unit_test.h" diff --git a/cpp/src/tests/amqp_0_10/Map.cpp b/cpp/src/tests/amqp_0_10/Map.cpp index efde967050..b5402bd11f 100644 --- a/cpp/src/tests/amqp_0_10/Map.cpp +++ b/cpp/src/tests/amqp_0_10/Map.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/amqp_0_10/Map.h" #include "qpid/amqp_0_10/Array.h" #include "qpid/amqp_0_10/Struct32.h" diff --git a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp b/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp index 9d4fcb8935..a6a7e4bbac 100644 --- a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp +++ b/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/amqp_0_10/ProxyTemplate.h" #include <boost/any.hpp> diff --git a/cpp/src/tests/amqp_0_10/apply.cpp b/cpp/src/tests/amqp_0_10/apply.cpp index 5a67c28c79..b3ff60e7fa 100644 --- a/cpp/src/tests/amqp_0_10/apply.cpp +++ b/cpp/src/tests/amqp_0_10/apply.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/amqp_0_10/specification.h" #include "qpid/amqp_0_10/ApplyControl.h" diff --git a/cpp/src/tests/amqp_0_10/handlers.cpp b/cpp/src/tests/amqp_0_10/handlers.cpp index 428643c802..1ca61e3331 100644 --- a/cpp/src/tests/amqp_0_10/handlers.cpp +++ b/cpp/src/tests/amqp_0_10/handlers.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/Exception.h" #include "qpid/amqp_0_10/Unit.h" #include "qpid/amqp_0_10/ControlHolder.h" diff --git a/cpp/src/tests/amqp_0_10/serialize.cpp b/cpp/src/tests/amqp_0_10/serialize.cpp index 0cfeb8d28d..2d5b9d75e4 100644 --- a/cpp/src/tests/amqp_0_10/serialize.cpp +++ b/cpp/src/tests/amqp_0_10/serialize.cpp @@ -19,8 +19,8 @@ * */ -#include "unit_test.h" -#include "allSegmentTypes.h" +#include "tests/amqp_0_10/unit_test.h" +#include "tests/amqp_0_10/allSegmentTypes.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/Buffer.h" diff --git a/cpp/src/tests/client_test.cpp b/cpp/src/tests/client_test.cpp index 05b42f620c..d78a7aa002 100644 --- a/cpp/src/tests/client_test.cpp +++ b/cpp/src/tests/client_test.cpp @@ -28,7 +28,7 @@ #include <iostream> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp index 50ca241b5d..2375eb17eb 100644 --- a/cpp/src/tests/cluster_test.cpp +++ b/cpp/src/tests/cluster_test.cpp @@ -16,11 +16,11 @@ * */ -#include "test_tools.h" -#include "unit_test.h" -#include "ForkedBroker.h" -#include "BrokerFixture.h" -#include "ClusterFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ForkedBroker.h" +#include "tests/BrokerFixture.h" +#include "tests/ClusterFixture.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionSettings.h" diff --git a/cpp/src/tests/consume.cpp b/cpp/src/tests/consume.cpp index 3aacf8b3da..be22bdccc9 100644 --- a/cpp/src/tests/consume.cpp +++ b/cpp/src/tests/consume.cpp @@ -25,7 +25,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp index 379e957ef1..faa8f416f7 100644 --- a/cpp/src/tests/exception_test.cpp +++ b/cpp/src/tests/exception_test.cpp @@ -19,9 +19,9 @@ * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/client/SubscriptionManager.h" #include "qpid/client/MessageListener.h" #include "qpid/sys/Runnable.h" diff --git a/cpp/src/tests/header_test.cpp b/cpp/src/tests/header_test.cpp index c36b4f3bc3..72da6d0073 100644 --- a/cpp/src/tests/header_test.cpp +++ b/cpp/src/tests/header_test.cpp @@ -21,7 +21,7 @@ #include <iostream> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/latencytest.cpp b/cpp/src/tests/latencytest.cpp index 6ad84e1b82..ecae673fb9 100644 --- a/cpp/src/tests/latencytest.cpp +++ b/cpp/src/tests/latencytest.cpp @@ -27,7 +27,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/sys/Thread.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" diff --git a/cpp/src/tests/logging.cpp b/cpp/src/tests/logging.cpp index 00e1d7de85..76f5a768dc 100644 --- a/cpp/src/tests/logging.cpp +++ b/cpp/src/tests/logging.cpp @@ -16,7 +16,7 @@ * */ -#include "test_tools.h" +#include "tests/test_tools.h" #include "qpid/log/Logger.h" #include "qpid/log/Options.h" #include "qpid/log/OstreamOutput.h" @@ -30,7 +30,7 @@ #include <boost/test/floating_point_comparison.hpp> #include <boost/format.hpp> -#include "unit_test.h" +#include "tests/unit_test.h" #include <exception> #include <fstream> diff --git a/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp index f55528fcd5..45f8164f5e 100644 --- a/cpp/src/tests/perftest.cpp +++ b/cpp/src/tests/perftest.cpp @@ -19,7 +19,7 @@ * */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/AsyncSession.h" #include "qpid/client/SubscriptionManager.h" diff --git a/cpp/src/tests/publish.cpp b/cpp/src/tests/publish.cpp index 34c2b8fefc..d447735aee 100644 --- a/cpp/src/tests/publish.cpp +++ b/cpp/src/tests/publish.cpp @@ -25,7 +25,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/qpid_ping.cpp b/cpp/src/tests/qpid_ping.cpp index cc07ade7bb..e55b9c5770 100644 --- a/cpp/src/tests/qpid_ping.cpp +++ b/cpp/src/tests/qpid_ping.cpp @@ -20,7 +20,7 @@ */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/SubscriptionManager.h" #include "qpid/client/Connection.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/receiver.cpp b/cpp/src/tests/receiver.cpp index 49f7ff0338..d3cc362dc4 100644 --- a/cpp/src/tests/receiver.cpp +++ b/cpp/src/tests/receiver.cpp @@ -24,7 +24,7 @@ #include <qpid/client/Message.h> #include <qpid/client/SubscriptionManager.h> #include <qpid/client/SubscriptionSettings.h> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include <iostream> #include <fstream> diff --git a/cpp/src/tests/sender.cpp b/cpp/src/tests/sender.cpp index 311de2e5f8..62f82070d8 100644 --- a/cpp/src/tests/sender.cpp +++ b/cpp/src/tests/sender.cpp @@ -26,7 +26,7 @@ #include <qpid/client/MessageReplayTracker.h> #include <qpid/client/QueueOptions.h> #include <qpid/Exception.h> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include <fstream> #include <iostream> diff --git a/cpp/src/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp index 44070cd4c9..f02690caa8 100644 --- a/cpp/src/tests/topic_listener.cpp +++ b/cpp/src/tests/topic_listener.cpp @@ -32,7 +32,7 @@ * listening). */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/MessageListener.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/topic_publisher.cpp b/cpp/src/tests/topic_publisher.cpp index 40055bbfa0..d1cddb5afe 100644 --- a/cpp/src/tests/topic_publisher.cpp +++ b/cpp/src/tests/topic_publisher.cpp @@ -34,7 +34,7 @@ * subscriber shutdown. */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/MessageListener.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/txjob.cpp b/cpp/src/tests/txjob.cpp index 94db96a666..fc16ef2b16 100644 --- a/cpp/src/tests/txjob.cpp +++ b/cpp/src/tests/txjob.cpp @@ -23,7 +23,7 @@ #include <boost/bind.hpp> #include <boost/ptr_container/ptr_vector.hpp> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/AsyncSession.h" #include "qpid/client/FailoverManager.h" #include "qpid/client/Message.h" diff --git a/cpp/src/tests/txshift.cpp b/cpp/src/tests/txshift.cpp index 97135c9829..1d11e366d2 100644 --- a/cpp/src/tests/txshift.cpp +++ b/cpp/src/tests/txshift.cpp @@ -23,7 +23,7 @@ #include <boost/bind.hpp> #include <boost/ptr_container/ptr_vector.hpp> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/AsyncSession.h" #include "qpid/client/FailoverManager.h" #include "qpid/client/Message.h" diff --git a/cpp/src/tests/txtest.cpp b/cpp/src/tests/txtest.cpp index c1ee246e2c..5b9d2703fb 100644 --- a/cpp/src/tests/txtest.cpp +++ b/cpp/src/tests/txtest.cpp @@ -26,7 +26,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/unit_test.cpp b/cpp/src/tests/unit_test.cpp index 00c61242e4..66b46a9116 100644 --- a/cpp/src/tests/unit_test.cpp +++ b/cpp/src/tests/unit_test.cpp @@ -19,5 +19,5 @@ // Defines test_main function to link with actual unit test code. #define BOOST_AUTO_TEST_MAIN // Boost 1.33 #define BOOST_TEST_MAIN -#include "unit_test.h" +#include "tests/unit_test.h" diff --git a/cpp/src/windows/QpiddBroker.cpp b/cpp/src/windows/QpiddBroker.cpp index a22ccba63f..e80319146b 100644 --- a/cpp/src/windows/QpiddBroker.cpp +++ b/cpp/src/windows/QpiddBroker.cpp @@ -29,7 +29,7 @@ const char *QPIDD_CONF_FILE = "qpid_broker.conf"; const char *QPIDD_MODULE_DIR = "."; } #endif -#include "qpidd.h" +#include "windows/qpidd.h" #include "qpid/Exception.h" #include "qpid/Options.h" #include "qpid/Plugin.h" |