Revised generation of includes inline with latst build changes.

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

10 files changed, 25 insertions, 25 deletions

diff --git a/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index f6dea0f669..26a9950d8a 100644
--- a/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
@@ -1125,7 +1125,7 @@ public class CppGenerator extends Generator
         while (mItr.hasNext())
         {
             AmqpMethod method = thisClass.methodMap.get(mItr.next());
-            sb.append(indent + "#include <qpid/framing/" + thisClass.name +
+            sb.append(indent + "#include <" + thisClass.name +
                 Utils.firstUpper(method.name) + "Body.h>" + cr);
         }
         return sb.toString();       
diff --git a/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 4a92c9c422..64471e4d61 100644
--- a/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -31,9 +31,9 @@
 #ifndef _AMQP_ClientOperations_
 #define _AMQP_ClientOperations_
 
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
+#include <FieldTable.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
 
 namespace qpid {
 namespace framing {
@@ -62,7 +62,7 @@ public:
     }
 
 	// Include framing constant declarations
-	#include <qpid/framing/AMQP_Constants.h>
+	#include <AMQP_Constants.h>
 	
     // Inner classes
 
diff --git a/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index fe9e3b0ff1..b9d8263cea 100644
--- a/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 
-#include <qpid/framing/AMQP_ClientProxy.h>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQP_ClientProxy.h>
+#include <AMQFrame.h>
 %{MLIST} ${cpc_method_body_include}
 
 namespace qpid {
diff --git a/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 48e2468674..62df7baf18 100644
--- a/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -29,9 +29,9 @@
 #ifndef _AMQP_ClientProxy_
 #define _AMQP_ClientProxy_
 
-#include <qpid/framing/AMQP_ClientOperations.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQP_ClientOperations.h>
+#include <FieldTable.h>
+#include <OutputHandler.h>
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index 4741fed638..6ab7812499 100644
--- a/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -28,7 +28,7 @@
 
 #include <sstream>
 
-#include <qpid/framing/AMQP_MethodVersionMap.h>
+#include <AMQP_MethodVersionMap.h>
 
 namespace qpid
 {
diff --git a/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 6b1418def5..d3ad37a8e0 100644
--- a/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -30,7 +30,7 @@
 #define _METHOD_VERSION_MAP_H_
 
 #include <map>
-#include <qpid/framing/AMQMethodBody.h>
+#include <AMQMethodBody.h>
 
 %{MLIST} ${mc_method_body_include}
 
diff --git a/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 7953e5be21..5728a4ce31 100644
--- a/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -31,9 +31,9 @@
 
 #include <sstream>
 
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
+#include <FieldTable.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
 
 namespace qpid {
 namespace framing {
@@ -62,7 +62,7 @@ public:
     }
     
 	// Include framing constant declarations
-	#include <qpid/framing/AMQP_Constants.h>
+	#include <AMQP_Constants.h>
 
     // Inner classes
 
diff --git a/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index 3bf043c51d..cce369f98b 100644
--- a/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 
-#include <qpid/framing/AMQP_ServerProxy.h>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQP_ServerProxy.h>
+#include <AMQFrame.h>
 %{MLIST} ${spc_method_body_include}
 
 namespace qpid {
diff --git a/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 33773116e3..9275c64590 100644
--- a/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,9 +29,9 @@
 #ifndef _AMQP_ServerProxy_
 #define _AMQP_ServerProxy_
 
-#include <qpid/framing/AMQP_ServerOperations.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQP_ServerOperations.h>
+#include <FieldTable.h>
+#include <OutputHandler.h>
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl b/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 2a562cadcf..be9fb82e31 100644
--- a/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -29,10 +29,10 @@
 #include <string>
 #include <sstream>
 
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h>
+#include <amqp_types.h>
+#include <AMQMethodBody.h>
+#include <Buffer.h>
+#include <FieldTable.h>
 
 #ifndef _${CLASS}${METHOD}Body_
 #define _${CLASS}${METHOD}Body_