Use execution layer to acknowledge messages.

Turn off 0-9 framing of requests and responses. 
Some refactoring around message delivery.



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

3 files changed, 9 insertions, 15 deletions

diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
index e78eec112f..66c19532c6 100644
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
@@ -51,6 +51,7 @@ public class AmqpMethod implements Printable, NodeAware, VersionConsistencyCheck
 	}
 
         public boolean isResponse(AmqpVersion version) {
+            if (!CppGenerator.USE_RELIABLE_FRAMING) return false;
 	    return (version == null) ? isResponseFlagMap.isSet() : isResponseFlagMap.isSet(version);
 	}
     
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index f31f9615fc..4fbda4e0fb 100644
--- a/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
@@ -29,6 +29,8 @@ import java.util.TreeMap;
 
 public class CppGenerator extends Generator
 {
+    protected static final boolean USE_RELIABLE_FRAMING = false;
+
     protected static final String versionNamespaceStartToken = "${version_namespace_start}";
     protected static final String versionNamespaceEndToken = "${version_namespace_end}";
         
@@ -150,12 +152,11 @@ public class CppGenerator extends Generator
                                               "buffer.putLongString(#)", // encodeExpression
                                               "buffer.getLongString(#)")); // decodeExpression
 
-        //NB: this is WRONG! but is here as a transitional aid
         typeMap.put("rfc1982-long-set", new DomainInfo(
-                                            "u_int16_t",                        // type
-                                            "2",                                        // size
-                                            "buffer.putShort(#)",       // encodeExpression
-                                            "# = buffer.getShort()"));  // decodeExpression
+                                              "SequenceNumberSet",                                // type
+                                              "#.encodedSize()",                       // size
+                                              "#.encode(buffer)",   // encodeExpression
+                                              "#.decode(buffer)")); // decodeExpression
     }
 
     public boolean isQuietFlag()
@@ -378,6 +379,7 @@ public class CppGenerator extends Generator
     }
 
     private String baseClass(AmqpMethod method, AmqpVersion version) {
+        if (!USE_RELIABLE_FRAMING) return "AMQMethodBody";
 	String base = method.isResponse(version) ? "AMQResponseBody":"AMQRequestBody";
 	return base;
     }
@@ -787,16 +789,6 @@ public class CppGenerator extends Generator
                                     sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize), false, true, true));
                                 }
 
-                                //if (abstractMethodFlag) sb.append("const MethodContext& context");
-                                //boolean leadingComma = abstractMethodFlag;
-                                //int paramIndent = indentSize + (5*tabSize);
-				//				sb.append(generateMethodParameterList(thisFieldMap, paramIndent, leadingComma, true, true));
-                                /*
-                                if (!abstractMethodFlag && method.isResponse(null)) {
-                                	if (!thisFieldMap.isEmpty()) sb.append(", \n"+Utils.createSpaces(paramIndent));
-                                	sb.append("	RequestId responseTo");
-                                }
-                                */
                                 sb.append(" )");
                                 if (abstractMethodFlag)
                                     sb.append(" = 0");
diff --git a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 093a5ffe90..aeabd8a256 100644
--- a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -37,6 +37,7 @@
 #include "qpid/framing/Buffer.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/framing/FramingContent.h"
+#include "qpid/framing/SequenceNumberSet.h"
 
 namespace qpid
 {