Merged revisions 492756 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid

........
  r492756 | kpvdr | 2007-01-04 16:30:39 -0500 (Thu, 04 Jan 2007) | 1 line
  
  Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and tidy-up in related code.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@516485 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 18 insertions, 29 deletions

diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
index 971571089f..d70adf1186 100644
--- a/cpp/lib/common/Makefile.am
+++ b/cpp/lib/common/Makefile.am
@@ -79,6 +79,7 @@ libqpidcommon_la_SOURCES =			\
   $(framing)/Value.cpp				\
   $(framing)/Proxy.cpp				\
   $(gen)/AMQP_ClientProxy.cpp			\
+  $(gen)/AMQP_HighestVersion.h		\
   $(gen)/AMQP_MethodVersionMap.cpp		\
   $(gen)/AMQP_ServerProxy.cpp			\
   Exception.cpp					\
diff --git a/gentools/src/org/apache/qpid/gentools/Main.java b/gentools/src/org/apache/qpid/gentools/Main.java
index e8c8a80a26..f1728ab290 100644
--- a/gentools/src/org/apache/qpid/gentools/Main.java
+++ b/gentools/src/org/apache/qpid/gentools/Main.java
@@ -240,7 +240,7 @@ public class Main
             new File(tmplDir + Utils.fileSeparator + "AMQP_Constants.h.tmpl"),
             new File(tmplDir + Utils.fileSeparator + "AMQP_MethodVersionMap.h.tmpl"),
             new File(tmplDir + Utils.fileSeparator + "AMQP_MethodVersionMap.cpp.tmpl"),
-            new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl")
+           new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl")
         };
         methodTemplateFiles = new File[]
         {
diff --git a/gentools/templ.java/MethodBodyClass.tmpl b/gentools/templ.java/MethodBodyClass.tmpl
index 11753394e7..21599956da 100644
--- a/gentools/templ.java/MethodBodyClass.tmpl
+++ b/gentools/templ.java/MethodBodyClass.tmpl
@@ -153,28 +153,16 @@ public class ${CLASS}${METHOD}Body extends AMQMethodBody implements EncodableAMQ
         return buf.toString();
     }
 
-    public static ${CLASS}${METHOD}Body createMethodBody(byte major, byte minor
+    public static AMQFrame createAMQFrame(int _channelId, byte major, byte minor
 %{FLIST}    ${mb_field_parameter_list}
                                          )
     {
-        return createMethodBody(major, minor, getClazz(major, minor), getMethod(major, minor)
-%{FLIST}    ${mb_field_passed_parameter_list}
-        );
-    }
-
-    public static ${CLASS}${METHOD}Body createMethodBody(byte major, byte minor, int clazzID, int methodID
-%{FLIST}    ${mb_field_parameter_list}
-                                         )
-    {
-        return new ${CLASS}${METHOD}Body(major, minor, clazzID, methodID
-%{FLIST}    ${mb_field_passed_parameter_list}
-        );
-    }
-
-    public ${CLASS}${METHOD}Body copy()
-    {
-        return new ${CLASS}${METHOD}Body(major, minor, getClazz(major, minor), getMethod(major, minor)
-%{FLIST}    ${mb_field_passed_parameter_list}
-        );
+        ${CLASS}${METHOD}Body body = new ${CLASS}${METHOD}Body(major, minor);
+%{FLIST}    ${mb_field_body_initialize}
+        		 
+        AMQFrame frame = new AMQFrame();
+        frame.channel = _channelId;
+        frame.bodyFrame = body;
+        return frame;
     }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index 55edea4bbb..6b88d605e1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
@@ -253,14 +253,14 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
 
                 String locales = "en_US";
                 // Interfacing with generated code - be aware of possible changes to parameter order as versions change.
-                AMQMethodBody connectionStartBody = ConnectionStartBody.createMethodBody
-                    ((byte)_major, (byte)_minor,	// AMQP version (major, minor)
-                     locales.getBytes(),	// locales
-                     mechanisms.getBytes(),	// mechanisms
-                     null,	// serverProperties
-                     (short)_major,	// versionMajor
-                     (short)_minor);	// versionMinor
-                writeRequest(0, connectionStartBody, _stateManager);
+                AMQFrame response = ConnectionStartBody.createAMQFrame((short) 0,
+            		_major, _minor,	// AMQP version (major, minor)
+                    locales.getBytes(),	// locales
+                    mechanisms.getBytes(),	// mechanisms
+                    null,	// serverProperties
+                	(short)_major,	// versionMajor
+                    (short)_minor);	// versionMinor
+                _minaProtocolSession.write(response);
             }
             catch (AMQException e)
             {