Author: kpvdr
Date: Thu Jan 4 13:30:39 2007
New Revision: 492756
URL: http://svn.apache.org/viewvc?view=rev&rev=492756
Log:
Fixed C++ client sending protocol version 0-0 over the wire. Minor fixes and
tidy-up in related code.
Added:
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
- copied, changed from r491906,
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl
Removed:
incubator/qpid/trunk/qpid/cpp/lib/common/framing/AMQP_HighestVersion.h
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl
Modified:
incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
Modified: incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am?view=diff&rev=492756&r1=492755&r2=492756
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/lib/common/Makefile.am Thu Jan 4 13:30:39
2007
@@ -72,7 +72,7 @@
$(framing)/ProtocolVersionException.cpp \
$(framing)/Value.cpp \
$(gen)/AMQP_ClientProxy.cpp \
- $(gen)/AMQP_HighestVersion.cpp \
+ $(gen)/AMQP_HighestVersion.h \
$(gen)/AMQP_MethodVersionMap.cpp \
$(gen)/AMQP_ServerProxy.cpp \
Exception.cpp \
@@ -105,7 +105,6 @@
$(framing)/Value.h \
$(framing)/amqp_framing.h \
$(framing)/amqp_types.h \
- $(framing)/AMQP_HighestVersion.h \
Exception.h \
ExceptionHolder.h \
QpidError.h \
Modified:
incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java?view=diff&rev=492756&r1=492755&r2=492756
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
(original)
+++ incubator/qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
Thu Jan 4 13:30:39 2007
@@ -202,7 +202,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.cpp.tmpl")
+ new File(tmplDir + Utils.fileSeparator +
"AMQP_HighestVersion.h.tmpl")
};
methodTemplateFiles = new File[]
{
Copied: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
(from r491906,
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl?view=diff&rev=492756&p1=incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl&r1=491906&p2=incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl&r2=492756
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.cpp.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl Thu
Jan 4 13:30:39 2007
@@ -1,4 +1,4 @@
-&{AMQP_HighestVersion.cpp}
+&{AMQP_HighestVersion.h}
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,18 @@
* Supported AMQP versions:
%{VLIST} * ${major}-${minor}
*/
+#ifndef _AMQP_HighestVersion_
+#define _AMQP_HighestVersion_
-#include <AMQP_HighestVersion.h>
+#include <ProtocolVersion.h>
-qpid::framing::ProtocolVersion highestProtocolVersion(${hv_latest_major},
${hv_latest_minor});
+
+namespace qpid {
+namespace framing {
+
+static ProtocolVersion highestProtocolVersion(${hv_latest_major},
${hv_latest_minor});
+
+} /* namespace framing */
+} /* namespace qpid */
+
+#endif
Modified: incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl?view=diff&rev=492756&r1=492755&r2=492756
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.java/MethodBodyClass.tmpl Thu Jan
4 13:30:39 2007
@@ -84,7 +84,7 @@
return buf.toString();
}
- public static AMQFrame createAMQFrame(int channelId, byte major, byte minor
+ public static AMQFrame createAMQFrame(int _channelId, byte major, byte
minor
%{FLIST} ${mb_field_parameter_list}
)
{
@@ -92,7 +92,7 @@
%{FLIST} ${mb_field_body_initialize}
AMQFrame frame = new AMQFrame();
- frame.channel = channelId;
+ frame.channel = _channelId;
frame.bodyFrame = body;
return frame;
}
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?view=diff&rev=492756&r1=492755&r2=492756
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Thu Jan 4 13:30:39 2007
@@ -165,17 +165,14 @@
_minor = pi.protocolMinor;
String mechanisms =
ApplicationRegistry.getInstance().getAuthenticationManager().getMechanisms();
String locales = "en_US";
- // AMQP version change: Hardwire the version to 0-8 (major=8,
minor=0)
- // TODO: Connect this to the session version obtained from
ProtocolInitiation for this session.
- // Be aware of possible changes to parameter order as versions
change.
+ // Interfacing with generated code - be aware of possible
changes to parameter order as versions change.
AMQFrame response = ConnectionStartBody.createAMQFrame((short)
0,
- (byte)8, (byte)0, // AMQP version (major, minor)
+ _major, _minor, // AMQP version (major, minor)
locales.getBytes(), // locales
mechanisms.getBytes(), // mechanisms
null, // serverProperties
- (short)8, // versionMajor
- (short)0 // versionMinor
- );
+ (short)_major, // versionMajor
+ (short)_minor); // versionMinor
_minaProtocolSession.write(response);
}
catch (AMQException e)
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java?view=diff&rev=492756&r1=492755&r2=492756
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
Thu Jan 4 13:30:39 2007
@@ -146,18 +146,6 @@
throw new AMQProtocolInstanceException("Protocol instance " +
CURRENT_PROTOCOL_INSTANCE + " was expected; received " +
protocolInstance);
}
- /*
- if (protocolMajor != CURRENT_PROTOCOL_VERSION_MAJOR)
- {
- throw new AMQProtocolVersionException("Protocol major version " +
CURRENT_PROTOCOL_VERSION_MAJOR +
- " was expected; received " + protocolMajor);
- }
- if (protocolMinor != CURRENT_PROTOCOL_VERSION_MINOR)
- {
- throw new AMQProtocolVersionException("Protocol minor version " +
CURRENT_PROTOCOL_VERSION_MINOR +
- " was expected; received " + protocolMinor);
- }
- */
/* Look through list of available protocol versions */
boolean found = false;
