Moved src/ source code to src/qpid directory:

 - allows rhm package to build consistently against checked-out or installed qpid. 
 - consistent correspondence between source paths and C++ namespaces.
 - consistent use of #include <qpid/foo> in source and by users.
 - allows header files to split over multiple directories,
   e.g. separating generated code, separating public API from private files.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@528668 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 16 insertions, 16 deletions

diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index d85f4bf229..137d66e90c 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -31,7 +31,7 @@
 
 #include <sstream>
 
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/ProtocolVersion.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index a1613c77f0..4fb49af330 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -27,8 +27,8 @@
  */
 #include <sstream>
 #include "AMQP_ClientProxy.h"
-#include "../framing/ChannelAdapter.h"
-#include "../framing/amqp_types_full.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/amqp_types_full.h"
 
 %{MLIST} ${cpc_method_body_include}
 
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 04f1f1020a..b6b8a19c44 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ClientProxy__
 #define qpid_framing_AMQP_ClientProxy__
 
-#include "../framing/Proxy.h"
+#include "qpid/framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
index fdbeb077d3..a3932d7cb5 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
@@ -28,7 +28,7 @@
 #ifndef qpid_framing_highestProtocolVersion__
 #define qpid_framing_highestProtocolVersion__
 
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/ProtocolVersion.h"
 
 
 namespace qpid {
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index ea61c1c91d..ee89386653 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -27,7 +27,7 @@
  */
 
 #include <sstream>
-#include "../framing/ProtocolVersionException.h"
+#include "qpid/framing/ProtocolVersionException.h"
 #include "AMQP_MethodVersionMap.h"
 
 namespace qpid
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 2bfadc80dd..83c3065a68 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -30,7 +30,7 @@
 #define qpid_framing_AMQP_MethodVersionMap__
 
 #include <map>
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
 
 %{MLIST} ${mc_method_body_include}
 
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 5b260f1882..be8dc2a6b3 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ServerOperations__
 #define qpid_framing_AMQP_ServerOperations__
 
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/ProtocolVersion.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index 9877047d26..44411491db 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 #include "AMQP_ServerProxy.h"
-#include "../framing/ChannelAdapter.h"
-#include "../framing/amqp_types_full.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/amqp_types_full.h"
 
 %{MLIST} ${spc_method_body_include}
 
diff --git a/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index e07a1fcf9c..454317c76f 100644
--- a/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ServerProxy__
 #define qpid_framing_AMQP_ServerProxy__
 
-#include "../framing/Proxy.h"
+#include "qpid/framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 68f3e92a45..2e1b2ed482 100644
--- a/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -32,11 +32,11 @@
 #include <string>
 #include <sstream>
 
-#include "../framing/amqp_types.h"
-#include "../framing/${mb_base_class}.h"
-#include "../framing/Buffer.h"
-#include "../framing/FieldTable.h"
-#include "../framing/FramingContent.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/${mb_base_class}.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/FramingContent.h"
 
 namespace qpid
 {