Fix for the most disruptive items in QPID-243.

* All #include lines now use '""' rather than '<>' where appropriate.
* #include lines within the qpid project use relative includes so that
  the same path will work in /usr/include when installed as part of the
  client libraries.
* All the source code has now been rearranged to be under src in a directory
  analogous to the namespace of the classes in it.


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

10 files changed, 16 insertions, 16 deletions

diff --git a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 165680457b..c41ca3406d 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -31,7 +31,7 @@
 
 #include <sstream>
 
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index e3602e20b7..a1613c77f0 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -27,8 +27,8 @@
  */
 #include <sstream>
 #include "AMQP_ClientProxy.h"
-#include "../lib/common/framing/ChannelAdapter.h"
-#include "../lib/common/framing/amqp_types_full.h"
+#include "../framing/ChannelAdapter.h"
+#include "../framing/amqp_types_full.h"
 
 %{MLIST} ${cpc_method_body_include}
 
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 05ff2aa5b1..04f1f1020a 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ClientProxy__
 #define qpid_framing_AMQP_ClientProxy__
 
-#include "../lib/common/framing/Proxy.h"
+#include "../framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
index 3d5dacf4dc..fdbeb077d3 100644
--- a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
@@ -28,7 +28,7 @@
 #ifndef qpid_framing_highestProtocolVersion__
 #define qpid_framing_highestProtocolVersion__
 
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
 
 
 namespace qpid {
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index bfb9ce1307..ea61c1c91d 100644
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -27,7 +27,7 @@
  */
 
 #include <sstream>
-#include "../lib/common/framing/ProtocolVersionException.h"
+#include "../framing/ProtocolVersionException.h"
 #include "AMQP_MethodVersionMap.h"
 
 namespace qpid
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 530f76f599..2bfadc80dd 100644
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -30,7 +30,7 @@
 #define qpid_framing_AMQP_MethodVersionMap__
 
 #include <map>
-#include "../lib/common/framing/AMQMethodBody.h"
+#include "../framing/AMQMethodBody.h"
 
 %{MLIST} ${mc_method_body_include}
 
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 1508815144..5b260f1882 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ServerOperations__
 #define qpid_framing_AMQP_ServerOperations__
 
-#include "../lib/common/framing/ProtocolVersion.h"
+#include "../framing/ProtocolVersion.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index c45af6a996..9877047d26 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 #include "AMQP_ServerProxy.h"
-#include "../lib/common/framing/ChannelAdapter.h"
-#include "../lib/common/framing/amqp_types_full.h"
+#include "../framing/ChannelAdapter.h"
+#include "../framing/amqp_types_full.h"
 
 %{MLIST} ${spc_method_body_include}
 
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 5e9ced4375..e07a1fcf9c 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ServerProxy__
 #define qpid_framing_AMQP_ServerProxy__
 
-#include "../lib/common/framing/Proxy.h"
+#include "../framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 2b5b6a541c..68f3e92a45 100644
--- a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -32,11 +32,11 @@
 #include <string>
 #include <sstream>
 
-#include "../lib/common/framing/amqp_types.h"
-#include "${mb_base_class}.h"
-#include "../lib/common/framing/Buffer.h"
-#include "../lib/common/framing/FieldTable.h"
-#include "../lib/common/framing/FramingContent.h"
+#include "../framing/amqp_types.h"
+#include "../framing/${mb_base_class}.h"
+#include "../framing/Buffer.h"
+#include "../framing/FieldTable.h"
+#include "../framing/FramingContent.h"
 
 namespace qpid
 {