Author: aconway
Date: Fri Mar 9 09:57:40 2007
New Revision: 516485
URL: http://svn.apache.org/viewvc?view=rev&rev=516485
Log:
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.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/lib/common/Makefile.am
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/Main.java
incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 9 09:57:40 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/Makefile.am?view=diff&rev=516485&r1=516484&r2=516485
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/Makefile.am Fri Mar 9
09:57:40 2007
@@ -79,6 +79,7 @@
$(framing)/Value.cpp \
$(framing)/Proxy.cpp \
$(gen)/AMQP_ClientProxy.cpp \
+ $(gen)/AMQP_HighestVersion.h \
$(gen)/AMQP_MethodVersionMap.cpp \
$(gen)/AMQP_ServerProxy.cpp \
Exception.cpp \
Modified:
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/Main.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/Main.java?view=diff&rev=516485&r1=516484&r2=516485
==============================================================================
---
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/Main.java
(original)
+++
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/Main.java
Fri Mar 9 09:57:40 2007
@@ -240,7 +240,7 @@
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[]
{
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl?view=diff&rev=516485&r1=516484&r2=516485
==============================================================================
--- incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
(original)
+++ incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
Fri Mar 9 09:57:40 2007
@@ -153,28 +153,16 @@
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;
}
}
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?view=diff&rev=516485&r1=516484&r2=516485
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Fri Mar 9 09:57:40 2007
@@ -253,14 +253,14 @@
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)
{
