Support for 0-10 sessions, not yet integrated. Misc minor fixes.

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

4 files changed, 38 insertions, 10 deletions

diff --git a/cpp/rubygen/framing.0-10/Operations.rb b/cpp/rubygen/framing.0-10/Operations.rb
index a22a591f14..4a67df8b92 100755
--- a/cpp/rubygen/framing.0-10/Operations.rb
+++ b/cpp/rubygen/framing.0-10/Operations.rb
@@ -24,8 +24,13 @@ class OperationsGen < CppGen
 
   def handler_classname(c) c.name.caps+"Handler"; end
 
+  def methods_on(parent, chassis)
+    chassis == "all" ?  parent.methods_ : parent.methods_on(chassis)
+  end
+
   def handler_class(c)
-    if (!c.methods_on(@chassis).empty?)
+    m = methods_on(c,@chassis)
+    if (not m.empty?)
       handlerclass=handler_classname c
       gen <<EOS
 // ==================== class #{handlerclass} ====================
@@ -38,7 +43,7 @@ class #{handlerclass} {
     virtual ~#{handlerclass}() {}
     // Protocol methods
 EOS
-      c.methods_on(@chassis).each { |m| handler_method(m) if !m.content() }
+      m.each { |m| handler_method(m) if !m.content() }
       gen <<EOS
 }; // class #{handlerclass}
 
@@ -48,7 +53,8 @@ EOS
   end
 
   def handler_get(c)
-    if (!c.methods_on(@chassis).empty?)
+    m = methods_on(c,@chassis)
+    if (not m.empty?)
       handlerclass=handler_classname c
       gen "virtual #{handlerclass}* get#{handlerclass}() = 0;\n"
     end
@@ -93,4 +99,5 @@ end
 
 OperationsGen.new("client",ARGV[0], $amqp).generate()
 OperationsGen.new("server",ARGV[0], $amqp).generate()
+OperationsGen.new("all",ARGV[0], $amqp).generate()
 
diff --git a/cpp/rubygen/framing.0-10/OperationsInvoker.rb b/cpp/rubygen/framing.0-10/OperationsInvoker.rb
index 642f98ce8e..44006207ca 100755
--- a/cpp/rubygen/framing.0-10/OperationsInvoker.rb
+++ b/cpp/rubygen/framing.0-10/OperationsInvoker.rb
@@ -13,10 +13,15 @@ class OperationsInvokerGen < CppGen
     @filename="qpid/framing/#{@chassis.caps}Invoker"
   end
 
+  def methods_on(parent, chassis)
+    chassis == "all"  ? parent.methods_ : parent.methods_on(chassis)
+  end
+
   def handler(c) "#{@ops}::#{c.cppname}Handler"; end
   def getter(c) "get#{c.cppname}Handler"; end
   def invoker(c) "#{handler(c)}::Invoker"; end
-  def visit_methods(c) c.methods_on(@chassis).select { |m| !m.content } end
+  def visit_methods(c) methods_on(c, @chassis).select { |m| !m.content } end
+  
   
   def handler_visits_cpp(c)
     visit_methods(c).each { |m|
@@ -90,3 +95,4 @@ end
 
 OperationsInvokerGen.new("client",ARGV[0], $amqp).generate()
 OperationsInvokerGen.new("server",ARGV[0], $amqp).generate()
+OperationsInvokerGen.new("all",ARGV[0], $amqp).generate()
diff --git a/cpp/rubygen/framing.0-10/Proxy.rb b/cpp/rubygen/framing.0-10/Proxy.rb
index 87d809d4ad..71a6b954c6 100755
--- a/cpp/rubygen/framing.0-10/Proxy.rb
+++ b/cpp/rubygen/framing.0-10/Proxy.rb
@@ -11,6 +11,10 @@ class ProxyGen < CppGen
     @filename="qpid/framing/#{@classname}"
   end
 
+  def methods_on(parent, chassis)
+    chassis == "all"  ? parent.methods_ : parent.methods_on(chassis)
+  end
+  
   def proxy_member(c) c.name.lcaps+"Proxy"; end
   
   def inner_class_decl(c)
@@ -21,7 +25,7 @@ public:
 #{cname}(FrameHandler& f) : Proxy(f) {}
 static #{cname}& get(#{@classname}& proxy) { return proxy.get#{cname}(); }
 EOS
-      c.methods_on(@chassis).each { |m|
+      methods_on(c, @chassis).each { |m|
         genl "virtual void #{m.cppname}(#{m.signature.join(",\n            ")});"
         genl
       }}
@@ -29,7 +33,7 @@ EOS
 
   def inner_class_defn(c)
     cname=c.cppname
-    c.methods_on(@chassis).each { |m| 
+    methods_on(c, @chassis).each { |m| 
       genl "void #{@classname}::#{cname}::#{m.cppname}(#{m.signature.join(", ")})"
       scope { 
         params=(["getVersion()"]+m.param_names).join(", ")
@@ -64,7 +68,7 @@ EOS
       include "<sstream>"
       include "#{@classname}.h"
       include "qpid/framing/amqp_types_full.h"
-      @amqp.methods_on(@chassis).each {
+      methods_on(@amqp, @chassis).each {
         |m| include "qpid/framing/"+m.body_name
       }
       genl
@@ -81,4 +85,5 @@ end
 
 ProxyGen.new("client", $outdir, $amqp).generate;
 ProxyGen.new("server", $outdir, $amqp).generate;
+ProxyGen.new("all", $outdir, $amqp).generate;
     
diff --git a/cpp/rubygen/framing.0-10/constants.rb b/cpp/rubygen/framing.0-10/constants.rb
index 35067a733c..752f50b6e9 100755
--- a/cpp/rubygen/framing.0-10/constants.rb
+++ b/cpp/rubygen/framing.0-10/constants.rb
@@ -48,7 +48,8 @@ class ConstantsGen < CppGen
       genl
       doxygen_comment { genl c.doc }
       struct(c.name.caps+"Exception", base) {
-        genl "#{c.name.caps}Exception(const std::string& msg=std::string()) : #{base}(#{c.value}, \"#{c.name}: \"+msg) {}"
+      genl "std::string getPrefix() const { return \"#{c.name}\"; }"
+      genl "#{c.name.caps}Exception(const std::string& msg=std::string()) : #{base}(#{c.value}, \"\"+msg) {}"
       }
   end
 
@@ -60,12 +61,14 @@ class ConstantsGen < CppGen
   def reply_exceptions_h()
     h_file("#{@dir}/reply_exceptions") {
       include "qpid/Exception"
+      include "qpid/ExceptionHolder"
       namespace(@namespace) {
         define_exceptions_for("execution", "error-code", "SessionException")
         define_exceptions_for("connection", "close-code", "ConnectionException")
         define_exceptions_for("session", "detach-code", "ChannelException")
         genl
         genl "void throwExecutionException(int code, const std::string& text);"
+        genl "void setExecutionException(ExceptionHolder& holder, int code, const std::string& text);"
       }
     }
   end
@@ -74,14 +77,21 @@ class ConstantsGen < CppGen
     cpp_file("#{@dir}/reply_exceptions") {
       include "#{@dir}/reply_exceptions"
       include "<sstream>"
+      include "<assert.h>"
       namespace("qpid::framing") {
         scope("void throwExecutionException(int code, const std::string& text) {"){
+          genl "ExceptionHolder h;"
+          genl "setExecutionException(h, code, text);"
+          genl "h.raise();"
+        }
+        scope("void setExecutionException(ExceptionHolder& holder, int code, const std::string& text) {"){        
           scope("switch (code) {") {
             enum = @amqp.class_("execution").domain("error-code").enum
             enum.choices.each { |c| 
-                genl "case #{c.value}: throw #{c.name.caps}Exception(text);"
+              genl "case #{c.value}: holder = new #{c.name.caps}Exception(text); break;"
             }
-            genl "default: break;"
+            genl 'default: assert(0);'
+            genl '    holder = new InvalidArgumentException(QPID_MSG("Bad exception code: " << code << ": " << text));'
           }
         }
       }