Refresh of transitional xml to more closely reflect latest specification

Initial execution-result support (not yet handled on c++ client)
Generation is now all done through the ruby code (it is a little slower at present I'm afraid, will try to speed it up over the next weeks)



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

89 files changed, 1774 insertions, 21388 deletions

diff --git a/cpp/README b/cpp/README
index c4cc67f133..35e3630502 100644
--- a/cpp/README
+++ b/cpp/README
@@ -54,7 +54,7 @@ all of the above plus:
  * libtool    <http://www.gnu.org/software/libtool/>   (1.5.22)
  * doxygen    <ftp://ftp.stack.nl/pub/users/dimitri/>  (1.5.1)
  * graphviz   <http://www.graphviz.org/>               (2.12)
- * JDK 5.0    <http://java.sun.com/j2se/1.5.0/>        (1.5.0.11)
+ * ruby 1.8   <http://www.ruby-lang.org>               (1.8.4)
 
 === Installing as root ===
 
diff --git a/cpp/gentools/README b/cpp/gentools/README
deleted file mode 100644
index c4abecc199..0000000000
--- a/cpp/gentools/README
+++ /dev/null
@@ -1,61 +0,0 @@
-================================================================================
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-================================================================================
-
-AMQP MULTI_VERSION CODE GENERATOR
-
-This directory contains the first part of the new multi-AMQP-version code
-generator. The Java generation is almost complete, C++ will follow.
-
-NOTE: The generator has NOT been integrated into the current build, and is
-included here to run stand-alone for the purposes of review and comment. As
-currently configured, this generator will not interact with any file or
-directory outside of this directory.
-
-To build (from this directory):
-rm org/apache/qpid/gentools/*.class
-javac  org/apache/qpid/gentools/Main.java
-
-Make sure you are using Sun's JDK1.5.0; Eclipse and gcj do not work.
-
-To run (from this directory):
-java org/apache/qpid/gentools/Main -j [xml_spec_file, ...]
-
-XML test files are located in the xml-src directory. Pay attention to the
-Basic class and Basic.Consume method - these were the primary test vehicles
-for this generator. *** NOTE *** These files do not represent any current or
-future version of the AMQP specification - do not use in production!
-
-Folders:
---------
-org/apache/qpid/gentools/: Source.
-xml-src/: Test AMQP specification files.
-templ.java/: Templates for java code generation.
-out.java/: Output folder for generated Java files (will be created with use
-           of -j flag on command-line).
-templ.cpp/: (Future:) Templates for C++ code generation.
-out.cpp/: Output folder for generated C++ files (will be created with use
-           of -c flag on command-line).
-
-For a more detaild description of the generator, see the Qpid Wiki
-(http://cwiki.apache.org/qpid/multiple-amqp-version-support.html).
-
-Please send comments and bugs to me (kim.vdriet [at] redhat.com) or via the
-Apache Qpid list (qpid-dev [at] incubator.apache.org).
-
-Kim van der Riet
diff --git a/cpp/gentools/build b/cpp/gentools/build
deleted file mode 100755
index ad9827b113..0000000000
--- a/cpp/gentools/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-cd src
-echo "--------- Building gentools ----------"
-echo "Clearing out old build files..."
-for f in org/apache/qpid/gentools/*.class; do
-	if [ -e $f ]; then
-		rm $f
-    fi
-done
-echo "Compiling..."
-javac org/apache/qpid/gentools/*.java
-echo "Done. Try it out..."
-java org.apache.qpid.gentools.Main
-echo "--------- Building gentools completed ----------"
-cd ..
diff --git a/cpp/gentools/build.xml b/cpp/gentools/build.xml
deleted file mode 100644
index 8fba85bc57..0000000000
--- a/cpp/gentools/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="gentools" default="compile">
-	<property name="src" location="src" />
-
-	<target name="compile">
-    	<javac srcdir="${src}" source="1.5" fork="true" />
-    </target>
-    
-	<target name="clean">
-    	<delete>
-        	<fileset dir="${src}/org/apache/qpid/gentools" includes="*.class" />
-    	</delete>
-    </target>
-
-</project>
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpClass.java
deleted file mode 100644
index 1bc9dc456a..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpClass.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class AmqpClass implements Printable, NodeAware 
-{
-	public LanguageConverter converter;
-	public AmqpVersionSet versionSet;
-	public AmqpFieldMap fieldMap;
-	public AmqpMethodMap methodMap;
-	public String name;
-	public AmqpOrdinalVersionMap indexMap;
-	
-	public AmqpClass(String name, LanguageConverter converter)
-	{
-		this.name = name;
-		this.converter = converter;
-		versionSet = new AmqpVersionSet();
-		fieldMap = new AmqpFieldMap();
-		methodMap = new AmqpMethodMap();
-		indexMap = new AmqpOrdinalVersionMap();
-	}
-
-	public boolean addFromNode(Node classNode, int ordinal, AmqpVersion version)
-		throws AmqpParseException, AmqpTypeMappingException
-	{
-		versionSet.add(version);
-		int index = Utils.getNamedIntegerAttribute(classNode, "index");
-		AmqpVersionSet indexVersionSet = indexMap.get(index);
-		if (indexVersionSet != null)
-			indexVersionSet.add(version);
-		else
-		{
-			indexVersionSet = new AmqpVersionSet();
-			indexVersionSet.add(version);
-			indexMap.put(index, indexVersionSet);
-		}
-		NodeList nList = classNode.getChildNodes();
-		int fieldCntr = fieldMap.size();
-		for (int i=0; i<nList.getLength(); i++)
-		{
-			Node child = nList.item(i);
-			if (child.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
-			{
-				String fieldName = converter.prepareDomainName(Utils.getNamedAttribute(child,
-						Utils.ATTRIBUTE_NAME));
-				AmqpField thisField = fieldMap.get(fieldName);
-				if (thisField == null)
-				{
-					thisField = new AmqpField(fieldName, converter);
-					fieldMap.put(fieldName, thisField);
-				}
-				if (!thisField.addFromNode(child, fieldCntr++, version))
-				{
-					String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
-							Utils.ATTRIBUTE_NAME));
-					System.out.println("INFO: Generation supression tag found for field " +
-							className + "." + fieldName + " - removing.");
-					thisField.removeVersion(version);
-					fieldMap.remove(fieldName);
-				}
-			}
-			else if (child.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
-			{
-				String methodName = converter.prepareMethodName(Utils.getNamedAttribute(child,
-						Utils.ATTRIBUTE_NAME));
-				AmqpMethod thisMethod = methodMap.get(methodName);
-				if (thisMethod == null)
-				{
-					thisMethod = new AmqpMethod(methodName, converter);
-					methodMap.put(methodName, thisMethod);
-				}			
-				int content = Utils.getNamedIntegerAttribute(child, Utils.ATTRIBUTE_CONTENT, 0);
-                                thisMethod.content = (content == 1);
-
-				if (!thisMethod.addFromNode(child, 0, version))
-				{
-					String className = converter.prepareClassName(Utils.getNamedAttribute(classNode,
-							Utils.ATTRIBUTE_NAME));
-					System.out.println("INFO: Generation supression tag found for method " +
-							className + "." + methodName + " - removing.");
-					thisMethod.removeVersion(version);
-					methodMap.remove(methodName);
-				}
-			}
-			else if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
-			{
-				String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
-				if (value.compareTo("no-gen") == 0)
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	public void removeVersion(AmqpVersion version)
-	{
-		indexMap.removeVersion(version);
-		fieldMap.removeVersion(version);
-		methodMap.removeVersion(version);
-		versionSet.remove(version);
-	}
-	
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-		String margin = Utils.createSpaces(marginSize);
-		String tab = Utils.createSpaces(tabSize);
-		out.println(margin + "[C] " + name + ": " + versionSet);
-		
-		for (Integer thisIndex : indexMap.keySet())
-		{
-			AmqpVersionSet indexVersionSet = indexMap.get(thisIndex);
-			out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
-		}
-		
-		for (String thisFieldName : fieldMap.keySet())
-		{
-			AmqpField thisField = fieldMap.get(thisFieldName);
-			thisField.print(out, marginSize + tabSize, tabSize);
-		}
-		
-		for (String thisMethodName : methodMap.keySet())
-		{
-			AmqpMethod thisMethod = methodMap.get(thisMethodName);
-			thisMethod.print(out, marginSize + tabSize, tabSize);
-		}
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
deleted file mode 100644
index 01d4df283b..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpClassMap extends TreeMap<String, AmqpClass>
-{
-	
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
deleted file mode 100644
index 6ccd2dbf99..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-import java.util.TreeMap;
-
-/**
- * @author kpvdr
- * Class to represent the &lt;constant&gt; declaration within the AMQP specification.
- * Currently, only integer values exist within the specification, however looking forward
- * to other possible types in the future, string and double types are also supported.
- * 
- * The &lt;constant&gt; declaration in the specification contains only two attributes:
- * name and value.
- * 
- * The value of the constant is mapped against the version(s) for which the name is defined.
- * This allows for a change in the value rather than the name only from one version to the next.
- */
-@SuppressWarnings("serial")
-public class AmqpConstant extends TreeMap<String, AmqpVersionSet>
-    implements Printable, VersionConsistencyCheck, Comparable<AmqpConstant>
-{
-    /**
-     * Constant name as defined by the name attribute of the &lt;constant&gt; declaration.
-     */
-    protected String name;
-    
-    /**
-     * Set of versions for which this constant name is defined.
-     */
-    protected AmqpVersionSet versionSet;
-
-    /**
-     * Constructor
-     * @param name Constant name as defined by the name attribute of the &lt;constant&gt; declaration.
-     * @param value Constant value as defined by the value attribute of the &lt;constant&gt; declaration.
-     * @param version AMQP version for which this constant is defined
-     */
-    public AmqpConstant (String name, String value, AmqpVersion version)
-    {
-        this.name = name;
-        versionSet = new AmqpVersionSet(version);
-        AmqpVersionSet valueVersionSet = new  AmqpVersionSet(version);
-        put(value, valueVersionSet);
-     }
-
-    /**
-     * Constructor
-     * @param name Constant name as defined by the name attribute of the &lt;constant&gt; declaration.
-     * @param value Constant value as defined by the value attribute of the &lt;constant&gt; declaration.
-     * @param version AMQP version for which this constant is defined
-     */
-    public AmqpConstant (String name, int value, AmqpVersion version)
-    {
-        this.name = name;
-        versionSet = new AmqpVersionSet(version);
-        AmqpVersionSet valueVersionSet = new  AmqpVersionSet(version);
-        put(String.valueOf(value), valueVersionSet);
-    }
-
-    /**
-     * Constructor
-     * @param name Constant name as defined by the name attribute of the &lt;constant&gt; declaration.
-     * @param value Constant value as defined by the value attribute of the &lt;constant&gt; declaration.
-     * @param version AMQP version for which this constant is defined
-     */
-    public AmqpConstant (String name, double value, AmqpVersion version)
-    {
-        this.name = name;
-        versionSet = new AmqpVersionSet(version);
-        AmqpVersionSet valueVersionSet = new  AmqpVersionSet(version);
-        put(String.valueOf(value), valueVersionSet);
-    }
-
-    /**
-     * Get the name of this constant.
-     * @return Name of this constant, being the name attribute of the &lt;constant&gt; declaration
-     * represented by this class.
-     */
-    public String getName()
-    {
-        return name;
-    }
-    
-    /**
-     * Get the value of this constant as a String.
-     * @param version AMQP version for which this value is required.
-     * @return Value of this constant, being the value attribute of the &lt;constant&gt; declaration
-     * represented by this class.
-     * @throws AmqpTypeMappingException when a value is requested for a version for which it is not
-     * defined in the AMQP specifications.
-     */
-    public String getStringValue(AmqpVersion version)
-    throws AmqpTypeMappingException
-    {
-    	for (String thisValue : keySet())
-        {
-            AmqpVersionSet versionSet = get(thisValue);
-            if (versionSet.contains(version))
-                return thisValue;
-        }
-        throw new AmqpTypeMappingException("Unable to find value for constant \"" + name +
-            "\" for version " + version.toString() + ".");
-    }
-    
-    /**
-     * Get the value of this constant as an integer.
-     * @param version AMQP version for which this value is required.
-     * @return Value of this constant, being the value attribute of the &lt;constant&gt; declaration
-     * represented by this class.
-     * @throws AmqpTypeMappingException when a value is requested for a version for which it is not
-     * defined in the AMQP specifications.
-     */
-    public int getIntegerValue(AmqpVersion version)
-    throws AmqpTypeMappingException
-    {
-        return Integer.parseInt(getStringValue(version));
-    }
-    
-    /**
-     * Get the value of this constant as a double.
-     * @param version AMQP version for which this value is required.
-     * @return Value of this constant, being the value attribute of the &lt;constant&gt; declaration
-     * represented by this class.
-     * @throws AmqpTypeMappingException when a value is requested for a version for which it is not
-     * defined in the AMQP specifications.
-     */
-    public double getDoubleValue(AmqpVersion version)
-    throws AmqpTypeMappingException
-    {
-        return Double.parseDouble(getStringValue(version));
-    }
-    
-    /**
-     * Get the version set for this constant. It contains the all the versions for which this
-     * constant name exists.
-     * @return Set of versions for which this constant exists.
-     */
-    public AmqpVersionSet getVersionSet()
-    {
-        return versionSet;
-    }
-    
-    /* (non-Javadoc)
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
-     */
-    
-    public int compareTo(AmqpConstant other)
-    {
-        int res = name.compareTo(other.name);
-        if (res != 0)
-            return res;
-        return versionSet.compareTo(other.versionSet);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.qpid.gentools.VersionConsistencyCheck#isVersionConsistent(org.apache.qpid.gentools.AmqpVersionSet)
-     */
-    public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-    {
-        if (size() != 1)
-            return false;
-        return get(firstKey()).equals(globalVersionSet);
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.qpid.gentools.Printable#print(java.io.PrintStream, int, int)
-     */
-    public void print(PrintStream out, int marginSize, int tabSize)
-    {
-        String margin = Utils.createSpaces(marginSize);
-        String tab = Utils.createSpaces(tabSize);
-        if (size() == 1)
-        {
-            out.println(margin + tab + "[C] " + name + " = \"" + firstKey() + "\" " + versionSet);
-        }
-        else
-        {
-            out.println(margin + tab + "[C] " + name + ": " + versionSet);
-            for (String thisValue : keySet())
-            {
-                 out.println(margin + tab + tab + "= \"" + thisValue + "\" " + get(thisValue));
-            }
-        }
-    }
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
deleted file mode 100644
index 7b38f5cf3c..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-import java.util.Iterator;
-import java.util.TreeSet;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author kpvdr
- * This class implements a set collection for {@link #AmqpConstant AmqpConstant} objects, being the collection
- * of constants accumulated from various AMQP specification files processed. Each name occurs once only in the set.
- * The {@link #AmqpConstant AmqpConstant} objects (derived from {@link java.util#TreeMap TreeMap}) keep track of
- * the value and version(s) assigned to this name.
- */
-@SuppressWarnings("serial")
-public class AmqpConstantSet extends TreeSet<AmqpConstant> implements Printable, NodeAware, Comparable<AmqpConstantSet>
-{
-    public LanguageConverter converter;
-
-    public AmqpConstantSet(LanguageConverter converter)
-    {
-        this.converter = converter;
-        this.converter.setConstantSet(this);
-    }
-    
-   /* (non-Javadoc)
-     * @see org.apache.qpid.gentools.NodeAware#addFromNode(org.w3c.dom.Node, int, org.apache.qpid.gentools.AmqpVersion)
-     */
-    public boolean addFromNode(Node node, int ordinal, AmqpVersion version)
-        throws AmqpParseException, AmqpTypeMappingException
-    {
-        NodeList nodeList = node.getChildNodes();
-        for (int i=0; i<nodeList.getLength(); i++)
-        {
-            Node childNode = nodeList.item(i);
-            if (childNode.getNodeName().compareTo(Utils.ELEMENT_CONSTANT) == 0)
-            {
-                String name = converter.prepareDomainName(Utils.getNamedAttribute(childNode, Utils.ATTRIBUTE_NAME));
-                String value = Utils.getNamedAttribute(childNode, Utils.ATTRIBUTE_VALUE);
-                // Find this name in the existing set of objects
-                boolean foundName = false;
-                Iterator<AmqpConstant> cItr = iterator();
-                while (cItr.hasNext() && !foundName)
-                {
-                    AmqpConstant thisConstant = cItr.next();
-                    if (name.compareTo(thisConstant.name) == 0)
-                    {
-                        foundName = true;
-                        thisConstant.versionSet.add(version);
-                        // Now, find the value in the map
-                        boolean foundValue = false;
-                        for (String thisValue : thisConstant.keySet())
-                        {
-                            if (value.compareTo(thisValue) == 0)
-                            {
-                                foundValue = true;
-                               // Add this version to existing version set.
-                                AmqpVersionSet versionSet = thisConstant.get(thisValue);
-                                versionSet.add(version);
-                            }
-                        }
-                        // Check that the value was found - if not, add it
-                        if (!foundValue)
-                        {
-                            thisConstant.put(value, new AmqpVersionSet(version));
-                        }              
-                    }
-                }
-                // Check that the name was found - if not, add it
-                if (!foundName)
-                {
-                    add(new AmqpConstant(name, value, version));
-                }
-           }
-        }
-        return true;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.qpid.gentools.Printable#print(java.io.PrintStream, int, int)
-     */
-    public void print(PrintStream out, int marginSize, int tabSize)
-    {
-        out.println(Utils.createSpaces(marginSize) + "Constants: ");
-        for (AmqpConstant thisAmqpConstant : this)
-        {
-        	thisAmqpConstant.print(out, marginSize, tabSize);
-        }
-    }
-    
-    /* (non-Javadoc)
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
-     */
-    public int compareTo(AmqpConstantSet other)
-    {
-        int res = size() - other.size();
-        if (res != 0)
-            return res;
-        Iterator<AmqpConstant> cItr = iterator();
-        Iterator<AmqpConstant> oItr = other.iterator();
-        while (cItr.hasNext() && oItr.hasNext())
-        {
-            AmqpConstant constant = cItr.next();
-            AmqpConstant oConstant = oItr.next();
-            res = constant.compareTo(oConstant);
-            if (res != 0)
-                return res;
-        }
-        return 0;
-    }
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
deleted file mode 100644
index 4796f31fb3..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpDomain extends TreeMap<String, AmqpVersionSet> implements Printable
-{
-	public String domainName;
-
-	public AmqpDomain(String domainName)
-	{
-		this.domainName = domainName;
-	}
-
-	public void addDomain(String domainType, AmqpVersion version) throws AmqpParseException
-	{
-		AmqpVersionSet versionSet = get(domainType);
-		if (versionSet == null) // First time, create new entry
-		{
-			versionSet = new AmqpVersionSet();
-			put(domainType, versionSet);
-		}
-		versionSet.add(version);
-	}
-
-	public String getDomainType(AmqpVersion version)
-	    throws AmqpTypeMappingException
-	{
-		for (String thisDomainType : keySet())
-		{
-			AmqpVersionSet versionSet = get(thisDomainType);
-			if (versionSet.contains(version))
-				return thisDomainType;
-		} throw new AmqpTypeMappingException("Unable to find version " + version + ".");
-	}
-	
-	public boolean hasVersion(String type, AmqpVersion v)
-	{
-		AmqpVersionSet vs = get(type);
-		if (vs == null)
-			return false;
-		return vs.contains(v);
-	}
-	
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-		String margin = Utils.createSpaces(marginSize);
-		String tab = Utils.createSpaces(tabSize);
-		out.println(margin + domainName + ":");
-		
-		for (String thisDomainType : keySet())
-		{
-			AmqpVersionSet vs = get(thisDomainType);
-			out.println(margin + tab + thisDomainType + " : " + vs.toString());
-		}
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
deleted file mode 100644
index 7e2974a444..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-import java.util.TreeMap;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-@SuppressWarnings("serial")
-public class AmqpDomainMap extends TreeMap<String, AmqpDomain> implements Printable, NodeAware
-{
-	public LanguageConverter converter;
-
-	public AmqpDomainMap(LanguageConverter converter)
-	{
-		this.converter = converter;
-		this.converter.setDomainMap(this);
-	}
-	
-	public boolean addFromNode(Node n, int o, AmqpVersion v)
-		throws AmqpParseException, AmqpTypeMappingException
-	{
-		NodeList nl = n.getChildNodes();
-		for (int i=0; i<nl.getLength(); i++)
-		{
-			Node c = nl.item(i);
-			// All versions 0.9 and greater use <domain> for all domains
-			if (c.getNodeName().compareTo(Utils.ELEMENT_DOMAIN) == 0)
-			{
-				String domainName = converter.prepareDomainName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_NAME));
-				String type = Utils.getNamedAttribute(c, Utils.ATTRIBUTE_TYPE);
-				AmqpDomain thisDomain = get(domainName);
-				if (thisDomain == null)
-				{
-					thisDomain = new AmqpDomain(domainName);
-					put(domainName, thisDomain);
-				}
-				thisDomain.addDomain(type, v);
-			}
-			// Version(s) 0.8 and earlier use <domain> for all complex domains and use
-			// attribute <field type=""...> for simple types. Add these simple types to
-			// domain list - but beware of duplicates!
-			else if (c.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
-			{
-				try
-				{
-					String type = converter.prepareDomainName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_TYPE));
-					AmqpDomain thisDomain = get(type);
-					if (thisDomain == null)
-					{
-						thisDomain = new AmqpDomain(type);
-						put(type, thisDomain);
-					}
-					if (!thisDomain.hasVersion(type, v))
-						thisDomain.addDomain(type, v);
-				}
-				catch (AmqpParseException e) {} // Ignore fields without type attribute
-			}
-			else if (c.getNodeName().compareTo(Utils.ELEMENT_CLASS) == 0 ||
-					 c.getNodeName().compareTo(Utils.ELEMENT_METHOD) == 0)
-			{
-				addFromNode(c, 0, v);
-			}
-		}
-		return true;
-	}
-
-	public String getDomainType(String domainName, AmqpVersion version)
-	    throws AmqpTypeMappingException
-	{
-		AmqpDomain domainType = get(domainName);
-		// For AMQP 8.0, primitive types were not described as domains, so
-		// return itself as the type.
-		if (domainType == null)
-		{
-			return domainName;
-		}
-		try
-		{
-			return domainType.getDomainType(version);
-		}
-		catch (AmqpTypeMappingException e)
-		{
-			throw new AmqpTypeMappingException("Unable to find domain type for domain \"" + domainName +
-				"\" version " + version + ".");
-		}
-	}
-	
-	
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-        out.println(Utils.createSpaces(marginSize) + "Domain Map:");
-        for (String thisDomainName : keySet())
-		{
-			AmqpDomain domain = get(thisDomainName);
-			domain.print(out, marginSize + tabSize, tabSize);
-		}
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
deleted file mode 100644
index f91d98bfe7..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpDomainVersionMap extends TreeMap<String, AmqpVersionSet> implements VersionConsistencyCheck
-{	
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-	{
-		if (size() != 1)
-			return false;
-		return get(firstKey()).equals(globalVersionSet);
-	}
-	
-	public boolean removeVersion(AmqpVersion version)
-	{
-		Boolean res = false;
-		ArrayList<String> removeList = new ArrayList<String>();
-		for (String domainName : keySet())
-		{
-			AmqpVersionSet versionSet = get(domainName);
-			if (versionSet.contains(version))
-			{
-				versionSet.remove(version);
-				if (versionSet.isEmpty())
-					removeList.add(domainName);
-				res = true;
-			}
-		}
-		// Get rid of domains no longer in use
-		for (String domainName : removeList)
-		{
-			remove(domainName);
-		}
-		return res;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpField.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpField.java
deleted file mode 100644
index e1177e0154..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpField.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class AmqpField implements Printable, NodeAware, VersionConsistencyCheck
-{
-	public LanguageConverter converter;
-	public AmqpVersionSet versionSet;
-	public AmqpDomainVersionMap domainMap;
-	public AmqpOrdinalVersionMap ordinalMap;
-	public String name;
-	
-	public AmqpField(String name, LanguageConverter converter)
-	{
-		this.name = name;
-		this.converter = converter;
-		versionSet = new AmqpVersionSet();
-		domainMap = new AmqpDomainVersionMap();
-		ordinalMap = new AmqpOrdinalVersionMap();
-	}
-
-	public boolean addFromNode(Node fieldNode, int ordinal, AmqpVersion version)
-		throws AmqpParseException, AmqpTypeMappingException
-	{
-		versionSet.add(version);
-		String domainType;
-		// Early versions of the spec (8.0) used the "type" attribute instead of "domain" for some fields.
-		try
-		{
-			domainType = converter.prepareDomainName(Utils.getNamedAttribute(fieldNode, Utils.ATTRIBUTE_DOMAIN));
-		}
-		catch (AmqpParseException e)
-		{
-			domainType = converter.prepareDomainName(Utils.getNamedAttribute(fieldNode, Utils.ATTRIBUTE_TYPE));
-		}
-		AmqpVersionSet thisVersionList = domainMap.get(domainType);
-		if (thisVersionList == null) // First time, create new entry
-		{
-			thisVersionList = new AmqpVersionSet();
-			domainMap.put(domainType, thisVersionList);
-		}
-		thisVersionList.add(version);
-		thisVersionList = ordinalMap.get(ordinal);
-		if (thisVersionList == null) // First time, create new entry
-		{
-			thisVersionList = new AmqpVersionSet();
-			ordinalMap.put(ordinal, thisVersionList);
-		}
-		thisVersionList.add(version);
-		NodeList nList = fieldNode.getChildNodes();
-		for (int i=0; i<nList.getLength(); i++)
-		{
-			Node child = nList.item(i);
-			if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
-			{
-				String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
-				if (value.compareTo("no-gen") == 0)
-					return false;
-			}
-		}
-		return true;
-	}
-	
-	public void removeVersion(AmqpVersion version)
-	{
-		domainMap.removeVersion(version);
-		ordinalMap.removeVersion(version);
-		versionSet.remove(version);
-	}
-	
-	public boolean isCodeTypeConsistent(LanguageConverter converter)
-	    throws AmqpTypeMappingException
-	{
-		if (domainMap.size() == 1)
-			return true; // By definition
-		ArrayList<String> codeTypeList = new ArrayList<String>();
-		for (String thisDomainName : domainMap.keySet())
-		{
-			AmqpVersionSet versionSet = domainMap.get(thisDomainName);
-			String codeType = converter.getGeneratedType(thisDomainName, versionSet.first());
-			if (!codeTypeList.contains(codeType))
-				codeTypeList.add(codeType);
-		}
-		return codeTypeList.size() == 1;
-	}
-	
-	public boolean isConsistent(Generator generator)
-        throws AmqpTypeMappingException
-	{
-		if (!isCodeTypeConsistent(generator))
-			return false;
-		if (ordinalMap.size() != 1)
-			return false;
-		// Since the various doamin names map to the same code type, add the version occurrences
-		// across all domains to see we have all possible versions covered
-		int vCntr = 0;
-		for (String thisDomainName : domainMap.keySet())
-		{
-			vCntr += domainMap.get(thisDomainName).size();
-		}
-		return vCntr == generator.globalVersionSet.size();
-	}
-	
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-		String margin = Utils.createSpaces(marginSize);
-		out.println(margin + "[F] " + name + ": " + versionSet);
-
-		for (Integer thisOrdinal : ordinalMap.keySet())
-		{
-			AmqpVersionSet versionList = ordinalMap.get(thisOrdinal);
-			out.println(margin + "  [O] " + thisOrdinal + " : " + versionList.toString());
-		}
-
-		for (String thisDomainName : domainMap.keySet())
-		{
-			AmqpVersionSet versionList = domainMap.get(thisDomainName);
-			out.println(margin + "  [D] " + thisDomainName + " : " + versionList.toString());
-		}
-	}
-	
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-	{
-		if (!versionSet.equals(globalVersionSet))
-			return false;
-		if (!domainMap.isVersionConsistent(globalVersionSet))
-			return false;
-		if (!ordinalMap.isVersionConsistent(globalVersionSet))
-			return false;
-		return true;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
deleted file mode 100644
index c91ec3d623..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpFieldMap extends TreeMap<String, AmqpField> implements VersionConsistencyCheck
-{
-	public void removeVersion(AmqpVersion version)
-	{
-		String[] fieldNameArray = new String[size()];
-		keySet().toArray(fieldNameArray);
-		for (String fieldName : fieldNameArray)
-		{
-			get(fieldName).removeVersion(version);
-			remove(fieldName);
-		}
-	}
-	
-	public AmqpFieldMap getFieldMapForOrdinal(int ordinal)
-	{
-		AmqpFieldMap newMap = new AmqpFieldMap();
-		for (String thisFieldName: keySet())
-		{
-			AmqpField field = get(thisFieldName);
-			TreeMap<Integer, AmqpVersionSet> ordinalMap = field.ordinalMap;
-			AmqpVersionSet ordinalVersions = ordinalMap.get(ordinal);
-			if (ordinalVersions != null)
-			{
-				newMap.put(field.name, field);
-			}
-		}
-		return newMap;
-	}
-	
-	public AmqpOrdinalFieldMap getMapForVersion(AmqpVersion version, boolean codeTypeFlag,
-		LanguageConverter converter)
-		throws AmqpTypeMappingException
-	{
-		// TODO: REVIEW THIS! There may be a bug here that affects C++ generation (only with >1 version)...
-		// If version == null (a common scenario) then the version map is built up on the
-		// basis of first found item, and ignores other version variations.
-		// This should probably be disallowed by throwing an NPE, as AmqpOrdinalFieldMap cannot
-		// represent these possibilities.
-		// *OR*
-		// Change the structure of AmqpOrdianlFieldMap to allow for the various combinations that
-		// will result from version variation - but that is what AmqpFieldMap is... :-$
-		AmqpOrdinalFieldMap ordinalFieldMap = new AmqpOrdinalFieldMap();
-		for (String thisFieldName: keySet())
-		{
-			AmqpField field = get(thisFieldName);
-			if (version == null || field.versionSet.contains(version))
-			{
-				// 1. Search for domain name in field domain map with version that matches
-				String domain = "";
-				boolean dFound = false;
-				for (String thisDomainName : field.domainMap.keySet())
-				{
-					domain = thisDomainName;
-					AmqpVersionSet versionSet = field.domainMap.get(domain);
-					if (version == null || versionSet.contains(version))
-					{
-						if (codeTypeFlag)
-							domain = converter.getGeneratedType(domain, version);
-						dFound = true;
-					}
-				}
-				
-				// 2. Search for ordinal in field ordianl map with version that matches
-				int ordinal = -1;
-				boolean oFound = false;
-				for (Integer thisOrdinal : field.ordinalMap.keySet())
-				{
-					ordinal = thisOrdinal;
-					AmqpVersionSet versionSet = field.ordinalMap.get(ordinal);
-					if (version == null || versionSet.contains(version))
-						oFound = true;
-				}
-				
-				if (dFound && oFound)
-				{
-					String[] fieldDomainPair = {field.name, domain};
-					ordinalFieldMap.put(ordinal, fieldDomainPair);
-				}
-			}
-		}
-		return ordinalFieldMap;
-	}
-		
-	public boolean isDomainConsistent(Generator generator, AmqpVersionSet versionSet)
-        throws AmqpTypeMappingException
-	{
-		if (size() != 1) // Only one field for this ordinal
-			return false;
-		return get(firstKey()).isConsistent(generator);
-	}
-	
-	public int getNumFields(AmqpVersion version)
-	{
-		int fCntr = 0;
-		for (String thisFieldName : keySet())
-		{
-			AmqpField field = get(thisFieldName);
-			if (field.versionSet.contains(version))
-				fCntr++;
-		}
-		return fCntr;
-	}
-	
-	public String parseFieldMap(Method commonGenerateMethod, Method mangledGenerateMethod,
-		int indentSize, int tabSize, LanguageConverter converter)
-        throws AmqpTypeMappingException, IllegalAccessException, InvocationTargetException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String cr = Utils.lineSeparator;
-		StringBuffer sb = new StringBuffer();
-		
-		if (commonGenerateMethod == null)
-		{
-			// Generate warnings in code if required methods are null.
-			sb.append(indent + "/*********************************************************" + cr);
-			sb.append(indent + " * WARNING: Generated code could be missing." + cr);
-			sb.append(indent + " * In call to parseFieldMap(), generation method was null." + cr);
-			sb.append(indent + " * Check for NoSuchMethodException on startup." + cr);
-			sb.append(indent + " *********************************************************/" + cr);
-		}
-
-		Iterator<String> itr = keySet().iterator();
-		while (itr.hasNext())
-		{
-			String fieldName = itr.next();
-			AmqpField field = get(fieldName);
-			if (field.isCodeTypeConsistent(converter))
-			{
-				// All versions identical - Common declaration
-				String domainName = field.domainMap.firstKey();
-				AmqpVersionSet versionSet = field.domainMap.get(domainName);
-				String codeType = converter.getGeneratedType(domainName, versionSet.first());
-				if (commonGenerateMethod != null)
-					sb.append(commonGenerateMethod.invoke(converter, codeType, field, versionSet,
-					    indentSize, tabSize, itr.hasNext()));
-			}
-			else if (mangledGenerateMethod != null) // Version-mangled
-			{
-				sb.append(mangledGenerateMethod.invoke(converter, field, indentSize, tabSize,
-					itr.hasNext()));
-			}
-		}
-		return sb.toString();		
-	}
-	
-	public String parseFieldMapOrdinally(Method generateMethod, Method bitGenerateMethod,
-		int indentSize, int tabSize, Generator codeGenerator)
-	    throws AmqpTypeMappingException, IllegalAccessException, InvocationTargetException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String cr = Utils.lineSeparator;
-		StringBuffer sb = new StringBuffer();	    
-
-		// Generate warnings in code if required methods are null.
-		if (generateMethod == null || bitGenerateMethod == null)
-		{
-			sb.append(indent + "/***********************************************" + cr);
-			sb.append(indent + " * WARNING: In call to parseFieldMapOrdinally():" + cr);
-			if (generateMethod == null)
-				sb.append(indent + " *  => generateMethod is null." + cr);
-			if (bitGenerateMethod == null)
-				sb.append(indent + " *  => bitGenerateMethod is null." + cr);
-			sb.append(indent + " * Generated code could be missing." + cr);
-			sb.append(indent + " * Check for NoSuchMethodException on startup." + cr);
-			sb.append(indent + " ***********************************************/" + cr);
-		}
-
-		/* We must process elements in ordinal order because adjacent booleans (bits)
-		 * must be combined into a single byte (in groups of up to 8). Start with shared
-		 * declarations until an ordinal divergence is found. (For most methods where
-		 * there is no difference between versions, this will simplify the generated
-		 * code. */
-
-		ArrayList<String> bitFieldList = new ArrayList<String>();
-		boolean ordinalDivergenceFlag = false;
-		int ordinal = 0;
-		while (ordinal < size() && !ordinalDivergenceFlag)
-		{
-			/* Since the getFieldMapOrdinal() function may map more than one Field to
-			 * an ordinal, the number of ordinals may be less than the total number of
-			 * fields in the fieldMap. Check for empty fieldmaps... */
-			AmqpFieldMap ordinalFieldMap = getFieldMapForOrdinal(ordinal);
-			if (ordinalFieldMap.size() > 0)
-			{
-				if (ordinalFieldMap.isDomainConsistent(codeGenerator, codeGenerator.globalVersionSet))
-				{
-					String fieldName = ordinalFieldMap.firstKey();
-					String domain = ordinalFieldMap.get(fieldName).domainMap.firstKey();
-					String domainType = codeGenerator.getDomainType(domain,
-						codeGenerator.globalVersionSet.first());
-					if (domainType.compareTo("bit") == 0)
-						bitFieldList.add(fieldName);
-					else if (bitFieldList.size() > 0)
-					{
-						// End of bit types - handle deferred bit type generation
-						if (bitGenerateMethod != null)
-							sb.append(bitGenerateMethod.invoke(codeGenerator, bitFieldList, ordinal,
-								indentSize, tabSize));
-						bitFieldList.clear();
-					}
-					if (!ordinalDivergenceFlag)
-					{
-						// Defer generation of bit types until all adjacent bits have been
-						// accounted for.
-						if (bitFieldList.size() == 0 && generateMethod != null)
-							sb.append(generateMethod.invoke(codeGenerator, domainType, fieldName, ordinal,
-								indentSize, tabSize));
-					}
-					ordinal++;
-				}
-				else
-				{
-					ordinalDivergenceFlag = true;
-				}
-			}
-		}
-
-		// Check if there is still more to do under a version-specific breakout
-		if (ordinalDivergenceFlag && ordinal< size())
-		{
-			// 1. Cycle through all versions in order, create outer if(version) structure
-			AmqpVersion[] versionArray = new AmqpVersion[codeGenerator.globalVersionSet.size()];
-			codeGenerator.globalVersionSet.toArray(versionArray);
-			for (int v=0; v<versionArray.length; v++)
-			{
-				sb.append(indent);
-				if (v > 0)
-					sb.append("else ");
-				sb.append("if (major == " + versionArray[v].getMajor() + " && minor == " +
-					versionArray[v].getMinor() + ")" + cr);
-				sb.append(indent + "{" + cr);
-				
-				// 2. Cycle though each ordinal from where we left off in the loop above.
-				ArrayList<String> bitFieldList2 = new ArrayList<String>(bitFieldList);
-				for (int o = ordinal; o<size(); o++)
-				{
-					AmqpFieldMap ordinalFieldMap = getFieldMapForOrdinal(o);
-					if (ordinalFieldMap.size() > 0)
-					{
-						// 3. Cycle through each of the fields that have this ordinal.
-						Iterator<String> i = ordinalFieldMap.keySet().iterator();
-						while (i.hasNext())
-						{
-							String fieldName = i.next();
-							AmqpField field = ordinalFieldMap.get(fieldName);
-
-							// 4. Some fields may have more than one ordinal - match by both
-							//    ordinal and version.
-							Iterator<Integer> j = field.ordinalMap.keySet().iterator();
-							while (j.hasNext())
-							{
-								int thisOrdinal = j.next();
-								AmqpVersionSet v1 = field.ordinalMap.get(thisOrdinal);
-								if (thisOrdinal == o && v1.contains(versionArray[v]))
-								{
-									// 5. Now get the domain for this version
-									int domainCntr = 0;
-									Iterator<String> k = field.domainMap.keySet().iterator();
-									while (k.hasNext())
-									{
-										// Mangle domain-divergent field names
-										String mangledFieldName = fieldName;
-										if (field.domainMap.size() > 1)
-											mangledFieldName += "_" + (domainCntr++);
-										String domainName = k.next();
-										AmqpVersionSet v2 = field.domainMap.get(domainName);
-										if (v2.contains(versionArray[v]))
-										{
-											// 6. (Finally!!) write the declaration
-											String domainType = codeGenerator.getDomainType(domainName,
-												versionArray[v]);
-											if (domainType.compareTo("bit") == 0)
-												bitFieldList2.add(mangledFieldName);
-											else if (bitFieldList2.size() > 0)
-											{
-												// End of bit types - handle deferred bit type generation
-												if (bitGenerateMethod != null)
-													sb.append(bitGenerateMethod.invoke(codeGenerator,
-														bitFieldList2, o, indentSize + tabSize,
-														tabSize));
-												bitFieldList2.clear();
-											}
-											// Defer generation of bit types until all adjacent bits have
-											// been accounted for.
-											if (bitFieldList2.size() == 0 && generateMethod != null)
-												sb.append(generateMethod.invoke(codeGenerator, domainType,
-														mangledFieldName, o, indentSize + tabSize, tabSize));
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-				// Check for remaining deferred bits
-				if (bitFieldList2.size() > 0 && bitGenerateMethod != null)
-					sb.append(bitGenerateMethod.invoke(codeGenerator, bitFieldList2, size(),
-						indentSize + tabSize, tabSize));
-				sb.append(indent + "}" + cr);
-			}
-		}
-		// Check for remaining deferred bits
-		else if (bitFieldList.size() > 0 && bitGenerateMethod != null)
-			sb.append(bitGenerateMethod.invoke(codeGenerator, bitFieldList, size(),
-				indentSize, tabSize));
-		return sb.toString();		
-	}
-	
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-	{
-		for (String thisFieldName : keySet())
-		{
-			AmqpField field = get(thisFieldName);
-			if (!field.isVersionConsistent(globalVersionSet))
-				return false;
-		}
-		return true;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
deleted file mode 100644
index 3f86326ce2..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpFlagMap extends TreeMap<Boolean, AmqpVersionSet> implements VersionConsistencyCheck
-{
-	public boolean isSet()
-	{
-		return containsKey(true);
-	}
-
-	public boolean isSet(AmqpVersion version)
-	{
-	    return containsKey(true) && get(true).contains(version);
-	}
-
-        public void setFlagForVersion(boolean flag, AmqpVersion version) {
-	    if (get(flag) == null) {
-		put(flag, new AmqpVersionSet(version));
-	    } else {
-		get(flag).add(version);
-	    }
-	}
-    
-	public String toString()
-	{
-		AmqpVersionSet versionSet = get(true);
-		if (versionSet != null)
-			return versionSet.toString();
-		return "";
-	}
-	
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-	{
-		if (size() != 1)
-			return false;
-		return get(firstKey()).equals(globalVersionSet);
-	}
-	
-	public boolean removeVersion(AmqpVersion version)
-	{
-		Boolean res = false;
-		ArrayList<Boolean> removeList = new ArrayList<Boolean>();
-		for (Boolean flag : keySet())
-		{
-			AmqpVersionSet versionSet = get(flag);
-			if (versionSet.contains(version))
-			{
-				versionSet.remove(version);
-				if (versionSet.isEmpty())
-					removeList.add(flag);
-				res = true;
-			}
-		}
-		// Get rid of flags no longer in use
-		for (Boolean flag : removeList)
-		{
-			remove(flag);
-		}
-		return res;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
deleted file mode 100644
index f00bb5fef8..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-
-public class AmqpMethod implements Printable, NodeAware, VersionConsistencyCheck
-{
-	public LanguageConverter converter;
-	public AmqpVersionSet versionSet;
-	public AmqpFieldMap fieldMap;
-	public String name;
-	public AmqpOrdinalVersionMap indexMap;
-	public AmqpFlagMap clientMethodFlagMap; // Method called on client (<chassis name="server"> in XML)
-	public AmqpFlagMap serverMethodFlagMap; // Method called on server (<chassis name="client"> in XML)
-        public boolean content;
-
-	public AmqpMethod(String name, LanguageConverter converter)
-	{
-		this.name = name;
-		this.converter = converter;
-		versionSet = new AmqpVersionSet();
-		fieldMap = new AmqpFieldMap();
-		indexMap = new AmqpOrdinalVersionMap();
-		clientMethodFlagMap = new AmqpFlagMap();
-		serverMethodFlagMap = new AmqpFlagMap();
-	}
-
-        /** Check if this method is named as a response by any other method in the class. */
-        public void checkForResponse(Element methodElement, AmqpVersion version) {
-	    Element clazz = (Element)methodElement.getParentNode();
-	    String methodName = methodElement.getAttribute("name");
-	    NodeList methods = clazz.getElementsByTagName("method");
-	    for (int i=0; i<methods.getLength(); ++i) {
-		Element method = (Element)methods.item(i);
-		NodeList responses = method.getElementsByTagName("response");
-		for (int j =0; j<responses.getLength(); ++j) {
-		    Element response = (Element)responses.item(j);
-		    if (methodName.equals(response.getAttribute("name"))) {
-		    }
-		}
-	    }
-        }
-    
-	public boolean addFromNode(Node methodNode, int ordinal, AmqpVersion version)
-		throws AmqpParseException, AmqpTypeMappingException
-	{
-		versionSet.add(version);
-		boolean serverChassisFlag = false;
-		boolean clientChassisFlag = false;
-		int index = Utils.getNamedIntegerAttribute(methodNode, "index");
-		AmqpVersionSet indexVersionSet = indexMap.get(index);
-		if (indexVersionSet != null)
-			indexVersionSet.add(version);
-		else
-		{
-			indexVersionSet = new AmqpVersionSet();
-			indexVersionSet.add(version);
-			indexMap.put(index, indexVersionSet);
-		}
-		NodeList nList = methodNode.getChildNodes();
-		int fieldCntr = fieldMap.size();
-		for (int i=0; i<nList.getLength(); i++)
-		{
-			Node child = nList.item(i);
-			if (child.getNodeName().compareTo(Utils.ELEMENT_FIELD) == 0)
-			{
-				String fieldName = converter.prepareDomainName(Utils.getNamedAttribute(child,
-						Utils.ATTRIBUTE_NAME));
-				AmqpField thisField = fieldMap.get(fieldName);
-				if (thisField == null)
-				{
-					thisField = new AmqpField(fieldName, converter);
-					fieldMap.put(fieldName, thisField);
-				}
-				if (!thisField.addFromNode(child, fieldCntr++, version))
-				{
-					String className = converter.prepareClassName(Utils.getNamedAttribute(methodNode.getParentNode(),
-							Utils.ATTRIBUTE_NAME));
-					String methodName = converter.prepareMethodName(Utils.getNamedAttribute(methodNode,
-							Utils.ATTRIBUTE_NAME));
-					System.out.println("INFO: Generation supression tag found for field " +
-							className + "." + methodName + "." + fieldName + " - removing.");
-					thisField.removeVersion(version);
-					fieldMap.remove(fieldName);
-				}
-			}
-			else if (child.getNodeName().compareTo(Utils.ELEMENT_CHASSIS) == 0)
-			{
-				String chassisName = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_NAME);
-				if (chassisName.compareTo("server") == 0)
-					serverChassisFlag = true;
-				else if (chassisName.compareTo("client") == 0)
-					clientChassisFlag = true;
-			}
-			else if (child.getNodeName().compareTo(Utils.ELEMENT_CODEGEN) == 0)
-			{
-				String value = Utils.getNamedAttribute(child, Utils.ATTRIBUTE_VALUE);
-				if (value.compareTo("no-gen") == 0)
-					return false;
-			}
-		}
-		checkForResponse((Element)methodNode, version);
-		processChassisFlags(serverChassisFlag, clientChassisFlag, version);
-		return true;
-	}
-	
-	public void removeVersion(AmqpVersion version)
-	{
-		clientMethodFlagMap.removeVersion(version);
-		serverMethodFlagMap.removeVersion(version);
-		indexMap.removeVersion(version);
-		fieldMap.removeVersion(version);
-		versionSet.remove(version);
-	}
-	
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-		String margin = Utils.createSpaces(marginSize);
-		String tab = Utils.createSpaces(tabSize);
-		out.println(margin + "[M] " + name + " {" + (serverMethodFlagMap.isSet() ? "S " +
-			serverMethodFlagMap + (clientMethodFlagMap.isSet() ? ", " : "") : "") +
-			(clientMethodFlagMap.isSet() ? "C " + clientMethodFlagMap : "") + "}" + ": " +
-			versionSet);
-		
-		for (Integer thisIndex : indexMap.keySet())
-		{
-			AmqpVersionSet indexVersionSet = indexMap.get(thisIndex);
-			out.println(margin + tab + "[I] " + thisIndex + indexVersionSet);
-		}
-		
-		for (String thisFieldName : fieldMap.keySet())
-		{
-			AmqpField thisField = fieldMap.get(thisFieldName);
-			thisField.print(out, marginSize + tabSize, tabSize);
-		}
-	}
-	
-	protected void processChassisFlags(boolean serverFlag, boolean clientFlag, AmqpVersion version)
-	{
-	    serverMethodFlagMap.setFlagForVersion(serverFlag, version);
-	    clientMethodFlagMap.setFlagForVersion(clientFlag, version);
-	}
-	
-	public AmqpOverloadedParameterMap getOverloadedParameterLists(AmqpVersionSet globalVersionSet,
-		Generator generator)
-		throws AmqpTypeMappingException
-	{
-		AmqpOverloadedParameterMap parameterVersionMap = new AmqpOverloadedParameterMap();
-		for (AmqpVersion thisVersion : globalVersionSet)
-		{
-			AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(thisVersion, true, generator);
-			AmqpVersionSet methodVersionSet = parameterVersionMap.get(ordinalFieldMap);
-			if (methodVersionSet == null)
-			{
-				methodVersionSet = new AmqpVersionSet();
-				methodVersionSet.add(thisVersion);
-				parameterVersionMap.put(ordinalFieldMap, methodVersionSet);
-			}
-			else
-			{
-				methodVersionSet.add(thisVersion);
-			}
-		}
-		return parameterVersionMap;
-	}
-		
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-	{
-		if (!versionSet.equals(globalVersionSet))
-			return false;
-		if (!clientMethodFlagMap.isVersionConsistent(globalVersionSet))
-			return false;
-		if (!serverMethodFlagMap.isVersionConsistent(globalVersionSet))
-			return false;
-		if (!indexMap.isVersionConsistent(globalVersionSet))
-			return false;
-		if (!fieldMap.isVersionConsistent(globalVersionSet))
-			return false;
-		return true;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
deleted file mode 100644
index 59eedd2a2b..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpMethodMap extends TreeMap<String, AmqpMethod>
-{
-	public void removeVersion(AmqpVersion version)
-	{
-		for (String methodName : keySet())
-		{
-			get(methodName).removeVersion(version);
-		}
-	}
-
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpModel.java
deleted file mode 100644
index 721247a4b2..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpModel.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class AmqpModel implements Printable, NodeAware
-{
-	public LanguageConverter converter;
-	public AmqpClassMap classMap;
-
-	public AmqpModel(LanguageConverter converter)
-	{
-		this.converter = converter;
-		this.converter.setModel(this);
-		classMap = new AmqpClassMap();
-	}
-
-	public boolean addFromNode(Node n, int o, AmqpVersion v)
-		throws AmqpParseException, AmqpTypeMappingException
-	{
-		NodeList nList = n.getChildNodes();
-		int eCntr = 0;
-		for (int i=0; i<nList.getLength(); i++)
-		{
-			Node c = nList.item(i);
-			if (c.getNodeName().compareTo(Utils.ELEMENT_CLASS) == 0)
-			{
-				String className = converter.prepareClassName(Utils.getNamedAttribute(c, Utils.ATTRIBUTE_NAME));
-				AmqpClass thisClass = classMap.get(className);
-				if (thisClass == null)
-				{
-					thisClass = new AmqpClass(className, converter);
-					classMap.put(className, thisClass);
-				}
-				if (!thisClass.addFromNode(c, eCntr++, v))
-				{
-					System.out.println("INFO: Generation supression tag found for class " + className + " - removing.");
-					thisClass.removeVersion(v);
-					classMap.remove(className);
-				}
-			}
-		}
-		return true;
-	}
-	
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-		out.println(Utils.createSpaces(marginSize) +
-			"[C]=class; [M]=method; [F]=field; [D]=domain; [I]=index; [O]=ordinal" + Utils.lineSeparator);
-		out.println(Utils.createSpaces(marginSize) + "Model:");
-
-		for (String thisClassName : classMap.keySet())
-		{
-			AmqpClass thisClass = classMap.get(thisClassName);
-			thisClass.print(out, marginSize + tabSize, tabSize);
-		}
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
deleted file mode 100644
index 34d3b7ca5f..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpOrdinalFieldMap extends TreeMap<Integer, String[]> implements Comparable
-{
-	protected static final int FIELD_DOMAIN = 1;
-	protected boolean codeTypeFlag = false;
-	
-	public int compareTo(Object obj)
-	{
-		AmqpOrdinalFieldMap o = (AmqpOrdinalFieldMap)obj;
-		Set<Integer> thisKeySet = keySet();
-		Set<Integer> oKeySet = o.keySet();
-		if (!thisKeySet.equals(oKeySet)) // Not equal, but why?
-		{
-			// Size difference
-			int sizeDiff = thisKeySet.size() - oKeySet.size(); // -ve if this < other
-			if (sizeDiff != 0)
-				return sizeDiff;
-			// Conetent difference
-			Iterator<Integer> itr = thisKeySet.iterator();
-			Iterator<Integer> oItr = oKeySet.iterator();
-			while (itr.hasNext() && oItr.hasNext())
-			{
-				int diff = itr.next() - oItr.next(); // -ve if this < other
-				if (diff != 0)
-					return diff;
-			}
-			// We should never get here...
-			System.err.println("AmqpOrdinalFieldMap.compareTo(): " +
-				"WARNING - unable to find cause of keySet difference.");
-		}
-		// Keys are equal, now check the String[]s
-		Iterator<Integer> itr = thisKeySet.iterator();
-		Iterator<Integer> oItr = oKeySet.iterator();
-		while (itr.hasNext() && oItr.hasNext())
-		{
-			String[] thisPair = get(itr.next());
-			String[] oPair = o.get(oItr.next());
-			// Size difference
-			int sizeDiff = thisPair.length - oPair.length; // -ve if this < other
-			if (sizeDiff != 0)
-				return sizeDiff;
-			// Conetent difference
-			for (int i=0; i<thisPair.length; i++)
-			{
-				int diff = thisPair[i].compareTo(oPair[i]);
-				if (diff != 0)
-					return diff;
-			}
-		}
-		return 0;
-	}
-	
-	public String toString()
-	{
-		StringBuffer sb = new StringBuffer();
-		for (Integer thisOrdinal : keySet())
-		{
-			String[] pair = get(thisOrdinal);
-			sb.append("[" + thisOrdinal + "] " + pair[0] + " : " + pair[1] + Utils.lineSeparator);
-		}
-		return sb.toString();
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
deleted file mode 100644
index 3706c9391d..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpOrdinalVersionMap extends TreeMap<Integer, AmqpVersionSet> implements VersionConsistencyCheck
-{
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet)
-	{
-		if (size() != 1)
-			return false;
-		return get(firstKey()).equals(globalVersionSet);
-	}
-    
-    public int getOrdinal(AmqpVersion version)
-    throws AmqpTypeMappingException
-    {
-    	for (Integer thisOrdinal : keySet())
-        {
-            AmqpVersionSet versionSet = get(thisOrdinal);
-            if (versionSet.contains(version))
-                return thisOrdinal;
-        }
-        throw new AmqpTypeMappingException("Unable to locate version " + version + " in ordianl version map.");
-    }
-	
-	public boolean removeVersion(AmqpVersion version)
-	{
-		Boolean res = false;
-		ArrayList<Integer> removeList = new ArrayList<Integer>();
-		for (Integer ordinal : keySet())
-		{
-			AmqpVersionSet versionSet = get(ordinal);
-			if (versionSet.contains(version))
-			{
-				versionSet.remove(version);
-				if (versionSet.isEmpty())
-				{
-					removeList.add(ordinal);
-				}
-				res = true;
-			}
-		}
-		// Get rid of ordinals no longer in use
-		for (Integer ordinal : removeList)
-		{
-			remove(ordinal);
-		}
-		return res;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
deleted file mode 100644
index 10978d0e4a..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.util.TreeMap;
-
-@SuppressWarnings("serial")
-public class AmqpOverloadedParameterMap extends TreeMap<AmqpOrdinalFieldMap, AmqpVersionSet>
-{
-
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpParseException.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
deleted file mode 100644
index 4d9f495390..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-@SuppressWarnings("serial")
-public class AmqpParseException extends Exception
-{
-	public AmqpParseException(String msg)
-	{
-		super(msg);
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
deleted file mode 100644
index b1e6f3d712..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-@SuppressWarnings("serial")
-public class AmqpTemplateException extends Exception
-{
-	public AmqpTemplateException(String msg)
-	{
-		super(msg);
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
deleted file mode 100644
index 1053543fdd..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-@SuppressWarnings("serial")
-public class AmqpTypeMappingException extends Exception
-{
-	public AmqpTypeMappingException(String msg)
-	{
-		super(msg);
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersion.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
deleted file mode 100644
index 579d8e28b2..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-public class AmqpVersion implements Comparable<AmqpVersion>
-{
-	private int major;
-	private int minor;
-	
-	public AmqpVersion(int major, int minor)
-	{
-		this.major = major;
-		this.minor = minor;
-	}
-
-	public AmqpVersion(AmqpVersion version)
-	{
-		this.major = version.major;
-		this.minor = version.minor;
-	}
-	
-	public int getMajor()
-	{
-		return major;
-	}
-	
-	public int getMinor()
-	{
-		return minor;
-	}
-	
-	public int compareTo(AmqpVersion v)
-	{
-		if (major != v.major)
-			return major - v.major;
-		if (minor != v.minor)
-			return minor - v.minor;
-		return 0;
-	}
-	
-	public String namespace()
-	{
-		return "ver_" + major + "_" + minor;
-	}
-	
-	public String toString()
-	{
-		return major + "-" + minor;
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java b/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
deleted file mode 100644
index 4406893cbb..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-//import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.TreeSet;
-
-@SuppressWarnings("serial")
-public class AmqpVersionSet extends TreeSet<AmqpVersion> implements Printable, Comparable<AmqpVersionSet>
-{
-    public AmqpVersionSet()
-    {
-    	super();
-    }
-    
-    public AmqpVersionSet(AmqpVersion version)
-    {
-    	super();
-        add(version);
-    }
-    
-    public AmqpVersion find(AmqpVersion version)
-    {
-    	for (AmqpVersion v : this)
-    	{
-    		if (v.compareTo(version) == 0)
-    			return v;
-    	}
-    	return null;
-    }
-    
-	public void print(PrintStream out, int marginSize, int tabSize)
-	{
-		out.print(Utils.createSpaces(marginSize) + "Version Set: " + toString() + Utils.lineSeparator);
-	}
-    
-    public int compareTo(AmqpVersionSet other)
-    {
-        int res = size() - other.size();
-        if (res != 0)
-            return res;
-        Iterator<AmqpVersion> vItr = iterator();
-        Iterator<AmqpVersion> oItr = other.iterator();
-        while (vItr.hasNext() && oItr.hasNext())
-        {
-            AmqpVersion version = vItr.next();
-            AmqpVersion oVersion = oItr.next();
-            res = version.compareTo(oVersion);
-            if (res != 0)
-                return res;
-        }
-        return 0;
-    }
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
deleted file mode 100644
index 114e3308d3..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ /dev/null
@@ -1,1693 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.TreeMap;
-
-public class CppGenerator extends Generator
-{
-    protected static final String versionNamespaceStartToken = "${version_namespace_start}";
-    protected static final String versionNamespaceEndToken = "${version_namespace_end}";
-        
-    // TODO: Move this to parent class
-    protected static final int FIELD_NAME = 0;
-    protected static final int FIELD_CODE_TYPE = 1;
-    
-    /**
-     * A complete list of C++ reserved words. The names of varous XML elements within the AMQP
-     * specification file are used for C++ identifier names in the generated code. Each proposed
-     * name is checked against this list and is modified (by adding an '_' to the end of the
-     * name - see function parseForReservedWords()) if found to be present.
-     */
-    protected static final String[] cppReservedWords = {"and", "and_eq", "asm", "auto", "bitand",
-                                                        "bitor", "bool", "break", "case", "catch", "char", "class", "compl", "const", "const_cast",
-                                                        "continue", "default", "delete", "do", "DomainInfo", "double", "dynamic_cast", "else",
-                                                        "enum", "explicit", "extern", "false", "float", "for", "friend", "goto", "if", "inline",
-                                                        "int", "long", "mutable", "namespace", "new", "not", "not_eq", "operator", "or", "or_eq",
-                                                        "private", "protected", "public", "register", "reinterpret_cast", "return", "short",
-                                                        "signed", "sizeof", "static", "static_cast", "struct", "switch", "template", "this",
-                                                        "throw", "true", "try", "typedef", "typeid", "typename", "union", "unsigned", "using",
-                                                        "virtual", "void", "volatile", "wchar_t", "while", "xor", "xor_eq"};
-    
-    /**
-     * Although not reserved words, the following list of variable names that may cause compile
-     * problems within a C++ environment because they clash with common #includes. The names of
-     * varous XML elements within the AMQP specification file are used for C++ identifier names
-     * in the generated code. Each proposed name is checked against this list and is modified
-     * (by adding an '_' to the end of the name - see function parseForReservedWords()) if found
-     * to be present. This list is best added to on an as-needed basis.
-     */
-    protected static final String[] cppCommonDefines = {"string"};
-    
-    // TODO: Move this to the Generator superclass?
-    protected boolean quietFlag; // Supress warning messages to the console
-        
-    private class DomainInfo    
-    {
-        public String type;
-        public String size;
-        public String encodeExpression;
-        public String decodeExpression;
-        public DomainInfo(String domain, String size, String encodeExpression,
-                          String decodeExpression)
-        {
-            this.type = domain;
-            this.size = size;
-            this.encodeExpression = encodeExpression;
-            this.decodeExpression = decodeExpression;
-        }
-    }
-        
-    private static TreeMap<String, DomainInfo> typeMap = new TreeMap<String, DomainInfo>();
-        
-    public CppGenerator(AmqpVersionSet versionList)
-    {
-        super(versionList);
-        quietFlag = true;
-        // Load C++ type and size maps.
-        // Adjust or add to these lists as new types are added/defined.
-        // The char '#' will be replaced by the field variable name (any type).
-        // The char '~' will be replaced by the compacted bit array size (type bit only).
-        typeMap.put("bit", new DomainInfo(
-                                          "bool",                                       // type
-                                          "~",                                  // size
-                                          "",                                           // encodeExpression
-                                          ""));                                 // decodeExpression
-        typeMap.put("content", new DomainInfo(
-                                              "Content",                                // type
-                                              "#.size()",                       // size
-                                              "buffer.putContent(#)",   // encodeExpression
-                                              "buffer.getContent(#)")); // decodeExpression
-        typeMap.put("long", new DomainInfo(
-                                           "u_int32_t",                 // type
-                                           "4",                                         // size
-                                           "buffer.putLong(#)", // encodeExpression
-                                           "# = buffer.getLong()"));    // decodeExpression
-        typeMap.put("longlong", new DomainInfo(
-                                               "u_int64_t",                     // type
-                                               "8",                                     // size
-                                               "buffer.putLongLong(#)", // encodeExpression
-                                               "# = buffer.getLongLong()")); // decodeExpression
-        typeMap.put("longstr", new DomainInfo(
-                                              "string",                         // type
-                                              "4 + #.length()",                 // size
-                                              "buffer.putLongString(#)", // encodeExpression
-                                              "buffer.getLongString(#)")); // decodeExpression
-        typeMap.put("octet", new DomainInfo(
-                                            "u_int8_t",                         // type
-                                            "1",                                        // size
-                                            "buffer.putOctet(#)",       // encodeExpression
-                                            "# = buffer.getOctet()"));  // decodeExpression
-        typeMap.put("short", new DomainInfo(
-                                            "u_int16_t",                        // type
-                                            "2",                                        // size
-                                            "buffer.putShort(#)",       // encodeExpression
-                                            "# = buffer.getShort()"));  // decodeExpression
-        typeMap.put("shortstr", new DomainInfo(
-                                               "string",                                // type
-                                               "1 + #.length()",                // size
-                                               "buffer.putShortString(#)", // encodeExpression
-                                               "buffer.getShortString(#)")); // decodeExpression
-        typeMap.put("table", new DomainInfo(
-                                            "FieldTable",                       // type
-                                            "#.size()",                         // size
-                                            "buffer.putFieldTable(#)", // encodeExpression
-                                            "buffer.getFieldTable(#)")); // decodeExpression
-        typeMap.put("timestamp", new DomainInfo(
-                                                "u_int64_t",                    // type
-                                                "8",                                    // size
-                                                "buffer.putLongLong(#)", // encodeExpression
-                                                "# = buffer.getLongLong()")); // decodeExpression
-
-        //some 0-10 types:
-
-        typeMap.put("uuid", new DomainInfo(
-                                              "string",                         // type
-                                              "4 + #.length()",                 // size
-                                              "buffer.putLongString(#)", // encodeExpression
-                                              "buffer.getLongString(#)")); // decodeExpression
-
-        typeMap.put("rfc1982-long-set", new DomainInfo(
-                                              "SequenceNumberSet",                                // type
-                                              "#.encodedSize()",                       // size
-                                              "#.encode(buffer)",   // encodeExpression
-                                              "#.decode(buffer)")); // decodeExpression
-    }
-
-    public boolean isQuietFlag()
-    {
-        return quietFlag;
-    }
-
-    public void setQuietFlag(boolean quietFlag)
-    {
-        this.quietFlag = quietFlag;
-    }
-        
-    // === Start of methods for Interface LanguageConverter ===
-        
-    public String prepareClassName(String className)
-    {
-        return camelCaseName(className, true);
-    }
-        
-    public String prepareMethodName(String methodName)
-    {
-        return camelCaseName(methodName, false);                
-    }
-        
-    public String prepareDomainName(String domainName)
-    {
-        return camelCaseName(domainName, false);                
-    }
-        
-    public String getDomainType(String domainName, AmqpVersion version)
-        throws AmqpTypeMappingException
-    {
-        if (version == null)
-            version = globalVersionSet.first();
-        return globalDomainMap.getDomainType(domainName, version);
-    }
-        
-    public String getGeneratedType(String domainName, AmqpVersion version)
-        throws AmqpTypeMappingException
-    {
-        String domainType = getDomainType(domainName, version);
-        if (domainType == null)
-            {
-                throw new AmqpTypeMappingException("Domain type \"" + domainName +
-                                                   "\" not found in C++ typemap.");
-            }
-        DomainInfo info = typeMap.get(domainType);
-        if (info == null)
-            {
-                throw new AmqpTypeMappingException("Unknown domain: \"" + domainType + "\"");
-            }
-        return info.type;
-    }
-        
-    // === Abstract methods from class Generator - C++-specific implementation ===
-        
-    @Override
-        protected String prepareFilename(String filenameTemplate, AmqpClass thisClass, AmqpMethod method,
-                                         AmqpField field)
-    {
-        StringBuffer sb = new StringBuffer(filenameTemplate);
-        if (thisClass != null)
-            replaceToken(sb, "${CLASS}", thisClass.name);
-        if (method != null)
-            replaceToken(sb, "${METHOD}", method.name);
-        if (field != null)
-            replaceToken(sb, "${FIELD}", field.name);
-        return sb.toString();
-    }
-        
-    @Override
-        protected void processTemplateA(String[] template)
-        throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-               IllegalAccessException, InvocationTargetException
-    {
-        processTemplateD(template, null, null, null);
-    }
-        
-    @Override
-        protected void processTemplateB(String[] template, AmqpClass thisClass)
-        throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-               IllegalAccessException, InvocationTargetException
-    {
-        processTemplateD(template, thisClass, null, null);
-    }
-        
-    @Override
-        protected void processTemplateC(String[] template, AmqpClass thisClass,
-                                        AmqpMethod method)
-        throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-               IllegalAccessException, InvocationTargetException
-    {
-        StringBuffer sb = new StringBuffer(template[templateStringIndex]);
-        String filename = prepareFilename(getTemplateFileName(sb), thisClass, method, null);
-        boolean templateProcessedFlag = false;
-                
-        // If method is not version consistent, create a namespace for each version
-        // i.e. copy the bit between the versionNamespaceStartToken and versionNamespaceEndToken
-        // once for each namespace.
-        if (method != null)
-            {
-                if (!method.isVersionConsistent(globalVersionSet))
-                    {
-                        int namespaceStartIndex = sb.indexOf(versionNamespaceStartToken);
-                        int namespaceEndIndex = sb.indexOf(versionNamespaceEndToken) +
-                            versionNamespaceEndToken.length();
-                        if (namespaceStartIndex >= 0 && namespaceEndIndex >= 0 &&
-                            namespaceStartIndex <= namespaceEndIndex)
-                            {
-                                String namespaceSpan = sb.substring(namespaceStartIndex, namespaceEndIndex) + cr;
-                                sb.delete(namespaceStartIndex, namespaceEndIndex);
-                                for (AmqpVersion v : method.versionSet)
-                                    {
-                                        StringBuffer nssb = new StringBuffer(namespaceSpan);
-                                        processTemplate(nssb, thisClass, method, null, template[templateFileNameIndex], v);
-                                        sb.insert(namespaceStartIndex, nssb);                                           
-                                    }
-                                // Process all tokens *not* within the namespace span prior to inserting namespaces
-                                processTemplate(sb, thisClass, method, null, template[templateFileNameIndex], null);
-                            }
-                        templateProcessedFlag = true;
-                    }
-            }
-        // Remove any remaining namespace tags
-        int nsTokenIndex = sb.indexOf(versionNamespaceStartToken);
-        while (nsTokenIndex > 0)
-            {
-                sb.delete(nsTokenIndex, nsTokenIndex + versionNamespaceStartToken.length());
-                nsTokenIndex = sb.indexOf(versionNamespaceStartToken);
-            }
-        nsTokenIndex = sb.indexOf(versionNamespaceEndToken);
-        while (nsTokenIndex > 0)
-            {
-                sb.delete(nsTokenIndex, nsTokenIndex + versionNamespaceEndToken.length());
-                nsTokenIndex = sb.indexOf(versionNamespaceEndToken);
-            }
-                
-        if (!templateProcessedFlag)
-            {
-                processTemplate(sb, thisClass, method, null, template[templateFileNameIndex], null);
-            }
-        writeTargetFile(sb, new File(genDir + Utils.fileSeparator + filename));
-        generatedFileCounter ++;
-    }
-        
-    @Override
-        protected void processTemplateD(String[] template, AmqpClass thisClass, AmqpMethod method,
-                                        AmqpField field)
-        throws IOException, AmqpTemplateException, AmqpTypeMappingException, IllegalAccessException,
-               InvocationTargetException
-    {
-        StringBuffer sb = new StringBuffer(template[templateStringIndex]);
-        String filename = prepareFilename(getTemplateFileName(sb), thisClass, method, field);
-        processTemplate(sb, thisClass, method, field, template[templateFileNameIndex], null);           
-        writeTargetFile(sb, new File(genDir + Utils.fileSeparator + filename));
-        generatedFileCounter ++;
-    }
-        
-    protected void processTemplate(StringBuffer sb, AmqpClass thisClass, AmqpMethod method,
-                                   AmqpField field, String templateFileName, AmqpVersion version)
-        throws InvocationTargetException, IllegalAccessException, AmqpTypeMappingException
-    {
-        try { processAllLists(sb, thisClass, method, version); }
-        catch (AmqpTemplateException e)
-            {
-                System.out.println("ERROR: " + templateFileName + ": " + e.getMessage());
-            }
-        try { processAllTokens(sb, thisClass, method, field, version); }
-        catch (AmqpTemplateException e)
-            {
-                System.out.println("ERROR: " + templateFileName + ": " + e.getMessage());
-            }
-    }
-
-    @Override
-        protected String processToken(String token, AmqpClass thisClass, AmqpMethod method, AmqpField field,
-                                      AmqpVersion version)
-        throws AmqpTemplateException, AmqpTypeMappingException
-    {
-        if (token.compareTo("${GENERATOR}") == 0)
-            return generatorInfo;
-        if (token.compareTo("${CLASS}") == 0 && thisClass != null)
-            return thisClass.name;
-        if (token.compareTo("${CLASS_ID_INIT}") == 0 && thisClass != null)
-            {
-                if (version == null)
-                    return String.valueOf(thisClass.indexMap.firstKey());
-                return getIndex(thisClass.indexMap, version);
-            }
-        if (token.compareTo("${METHOD}") == 0 && method != null)
-            return method.name;
-        if (token.compareTo("${METHOD_ID_INIT}") == 0 && method != null)
-            {
-                if (version == null)
-                    return String.valueOf(method.indexMap.firstKey());
-                return getIndex(method.indexMap, version);
-            }
-        if (token.compareTo("${FIELD}") == 0 && field != null)
-            return field.name;
-        if (token.equals(versionNamespaceStartToken) && version != null)
-            return "namespace " + version.namespace() + cr + "{";
-        if (token.equals(versionNamespaceEndToken) && version != null)
-            return "} // namespace " + version.namespace();
-        if (token.equals("${mb_constructor_with_initializers}"))
-            return generateConstructor(thisClass, method, version, 4, 4);
-        if (token.equals("${mb_server_operation_invoke}"))
-            return generateServerOperationsInvoke(thisClass, method, version, 4, 4);
-        if (token.equals("${mb_server_operation_invoke2}"))
-            return generateServerOperationsInvoke2(thisClass, method, version, 4, 4);
-        if (token.equals("${mb_buffer_param}"))
-            return method.fieldMap.size() > 0 ? " buffer" : "/*buffer*/";
-        if (token.equals("${hv_latest_major}"))
-            return String.valueOf(globalVersionSet.last().getMajor());
-        if (token.equals("${hv_latest_minor}"))
-            return String.valueOf(globalVersionSet.last().getMinor());
-	if (token.equals("${mb_base_class}")) 
-	    return baseClass(method, version);
-            
-        throw new AmqpTemplateException("Template token " + token + " unknown.");       
-    }
-
-    private String baseClass(AmqpMethod method, AmqpVersion version) {
-        return "AMQMethodBody";
-    }
-    
-    @Override
-        protected void processClassList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-                                        AmqpModel model)
-        throws AmqpTemplateException, AmqpTypeMappingException
-    {
-        String codeSnippet;
-        int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-        String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-        int tokxStart = tline.indexOf('$');
-        String token = tline.substring(tokxStart).trim();
-        sb.delete(listMarkerStartIndex, lend);
-                
-        // ClientOperations.h
-        if (token.compareTo("${coh_method_handler_get_method}") == 0)
-            {
-                codeSnippet = generateOpsMethodHandlerGetMethods(model, false, 4);
-            }
-        else if (token.compareTo("${coh_inner_class}") == 0)
-            {
-                codeSnippet = generateOpsInnerClasses(model, false, 4, 4);
-            }
-                
-        // ServerOperations.h
-        else if (token.compareTo("${soh_method_handler_get_method}") == 0)
-            {
-                codeSnippet = generateOpsMethodHandlerGetMethods(model, true, 4);
-            }
-        else if (token.compareTo("${soh_inner_class}") == 0)
-            {
-                codeSnippet = generateOpsInnerClasses(model, true, 4, 4);
-            }
-                
-        // ClientProxy.h/cpp
-        else if (token.compareTo("${cph_inner_class_instance}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassInstances(model, false, 4);
-            }
-        else if (token.compareTo("${cph_inner_class_get_method}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassGetMethodDecls(model, false, 4);
-            }
-        else if (token.compareTo("${cph_inner_class_defn}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassDeclarations(model, false, 4, 4);
-            }
-        else if (token.compareTo("${cpc_constructor_initializer}") == 0)
-            {
-                codeSnippet = generateProxyConstructorInitializers(model, false, 4);
-            }
-        else if (token.compareTo("${cpc_inner_class_get_method}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassGetMethodImpls(model, false, 0, 4);
-            }
-        else if (token.compareTo("${cpc_inner_class_impl}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassImpl(model, false, 0, 4);
-            }
-        else if (token.compareTo("${cph_handler_pointer_defn}") == 0)
-            {
-                codeSnippet = generateHandlerPointerDefinitions(model, false, 4);
-            }
-        else if (token.compareTo("${cph_handler_pointer_get_method}") == 0)
-            {
-                codeSnippet = generateHandlerPointerGetMethods(model, false, 4);
-            }
-                
-        // SerrverProxy.h/cpp
-        else if (token.compareTo("${sph_inner_class_instance}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassInstances(model, true, 4);
-            }
-        else if (token.compareTo("${sph_inner_class_get_method}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassGetMethodDecls(model, true, 4);
-            }
-        else if (token.compareTo("${sph_inner_class_defn}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassDeclarations(model, true, 4, 4);
-            }
-        else if (token.compareTo("${spc_constructor_initializer}") == 0)
-            {
-                codeSnippet = generateProxyConstructorInitializers(model, true, 4);
-            }
-        else if (token.compareTo("${spc_inner_class_get_method}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassGetMethodImpls(model, true, 0, 4);
-            }
-        else if (token.compareTo("${spc_inner_class_impl}") == 0)
-            {
-                codeSnippet = generateProxyInnerClassImpl(model, true, 0, 4);
-            }
-        else if (token.compareTo("${sph_handler_pointer_defn}") == 0)
-            {
-                codeSnippet = generateHandlerPointerDefinitions(model, true, 4);
-            }
-        else if (token.compareTo("${sph_handler_pointer_get_method}") == 0)
-            {
-                codeSnippet = generateHandlerPointerGetMethods(model, true, 4);
-            }
-                
-        // amqp_methods.h/cpp
-        else if (token.compareTo("${mh_method_body_class_indlude}") == 0)
-            {
-                codeSnippet = generateMethodBodyIncludeList(model, 0);
-            }
-        else if (token.compareTo("${mh_method_body_class_instance}") == 0)
-            {
-                codeSnippet = generateMethodBodyInstances(model, 0);
-            }
-        else if (token.compareTo("${mc_create_method_body_map_entry}") == 0)
-            {
-                codeSnippet = generateMethodBodyMapEntry(model, 4);
-            }
-        
-        else // Oops!
-            {
-                throw new AmqpTemplateException("Template token \"" + token + "\" unknown.");
-            }
-        sb.insert(listMarkerStartIndex, codeSnippet);
-    }
-        
-    @Override
-        protected void processMethodList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-                                         AmqpClass thisClass)
-        throws AmqpTemplateException, AmqpTypeMappingException
-    {
-        String codeSnippet;
-        int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-        String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-        int tokxStart = tline.indexOf('$');
-        String token = tline.substring(tokxStart).trim();
-        sb.delete(listMarkerStartIndex, lend);
-        
-        if (token.compareTo("${cpc_method_body_include}") == 0)
-            {
-                codeSnippet = generateMethodBodyIncludes(thisClass, 0);
-            }
-        else if (token.compareTo("${spc_method_body_include}") == 0)
-            {
-                codeSnippet = generateMethodBodyIncludes(thisClass, 0);
-            }
-        else if (token.compareTo("${mc_method_body_include}") == 0)
-            {
-                codeSnippet = generateMethodBodyIncludes(thisClass, 0);
-            }
-       
-        else // Oops!
-            {
-                throw new AmqpTemplateException("Template token " + token + " unknown.");
-            }
-        sb.insert(listMarkerStartIndex, codeSnippet);
-    }
-        
-    @Override
-        protected void processFieldList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-                                        AmqpFieldMap fieldMap, AmqpVersion version)
-        throws AmqpTypeMappingException, AmqpTemplateException, IllegalAccessException,
-               InvocationTargetException
-    {
-        String codeSnippet;
-        int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-        String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-        int tokxStart = tline.indexOf('$');
-        String token = tline.substring(tokxStart).trim();
-        sb.delete(listMarkerStartIndex, lend);
-                
-        if (token.equals("${mb_field_declaration}") )
-	    codeSnippet = generateFieldDeclarations(fieldMap, version, 4);
-        else if (token.equals("${mb_field_get_method}") )
-	    codeSnippet = generateFieldGetMethods(fieldMap, version, 4);
-        else if (token.equals("${mb_field_print}") )
-	    codeSnippet = generatePrintMethodContents(fieldMap, version, 8);
-        else if (token.equals("${mb_body_size}") )
-	    codeSnippet = generateBodySizeMethodContents(fieldMap, version, 8);
-        else if (token.equals("${mb_encode}") )
-	    codeSnippet = generateEncodeMethodContents(fieldMap, version, 8);
-        else if (token.equals("${mb_decode}") )
-	    codeSnippet = generateDecodeMethodContents(fieldMap, version, 8);
-        else // Oops!
-	    throw new AmqpTemplateException("Template token " + token + " unknown.");
-        sb.insert(listMarkerStartIndex, codeSnippet);
-    }
-
-    @Override
-        protected void processConstantList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-                                           AmqpConstantSet constantSet)
-        throws AmqpTemplateException, AmqpTypeMappingException
-    {
-        String codeSnippet;
-        int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-        String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-        int tokxStart = tline.indexOf('$');
-        String token = tline.substring(tokxStart).trim();
-        sb.delete(listMarkerStartIndex, lend);
-        
-        if (token.compareTo("${ch_get_value_method}") == 0)
-            {
-                codeSnippet = generateConstantGetMethods(constantSet, 4, 4);
-            }
-
-        else // Oops!
-            {
-                throw new AmqpTemplateException("Template token " + token + " unknown.");
-            }
-        sb.insert(listMarkerStartIndex, codeSnippet);
-    }
-                
-    // === Protected and private helper functions unique to C++ implementation ===
-    
-    // Methods for generation of code snippets for AMQP_Constants.h file
-    
-    protected String generateConstantGetMethods(AmqpConstantSet constantSet,
-                                                int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        for (AmqpConstant thisConstant : constantSet)
-            {
-                if (thisConstant.isVersionConsistent(globalVersionSet))
-                    {
-                        // return a constant
-                        String value = thisConstant.firstKey();
-                        sb.append(indent + "static const char* " + thisConstant.name + "() { return \"" +
-                                  thisConstant.firstKey() + "\"; }" + cr);
-                        if (Utils.containsOnlyDigits(value))
-                            {
-                                sb.append(indent + "static int " + thisConstant.name + "AsInt() { return " +
-                                          thisConstant.firstKey() + "; }" + cr);
-                            }
-                        if (Utils.containsOnlyDigitsAndDecimal(value))
-                            {
-                                sb.append(indent + "static double " + thisConstant.name + "AsDouble() { return (double)" +
-                                          thisConstant.firstKey() + "; }" + cr);
-                            }
-                        sb.append(cr);
-                    }
-                else
-                    {
-                        // Return version-specific constant
-                        sb.append(generateVersionDependentGet(thisConstant, "const char*", "", "\"", "\"", indentSize, tabSize));
-                        sb.append(generateVersionDependentGet(thisConstant, "int", "AsInt", "", "", indentSize, tabSize));
-                        sb.append(generateVersionDependentGet(thisConstant, "double", "AsDouble", "(double)", "", indentSize, tabSize));
-                        sb.append(cr);
-                    }
-            }        
-        return sb.toString();       
-    }
-    
-    protected String generateVersionDependentGet(AmqpConstant constant, String methodReturnType,
-                                                 String methodNameSuffix, String returnPrefix, String returnPostfix, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        sb.append(indent + methodReturnType + " " + constant.name + methodNameSuffix +
-                  "() const" + cr);
-        sb.append(indent + "{" + cr);
-        boolean first = true;
-        for (String thisValue : constant.keySet())
-            {
-                AmqpVersionSet versionSet = constant.get(thisValue);
-                sb.append(indent + tab + (first ? "" : "else ") + "if (" + generateVersionCheck(versionSet) +
-                          ")" + cr);
-                sb.append(indent + tab + "{" + cr);
-                if (methodReturnType.compareTo("int") == 0 && !Utils.containsOnlyDigits(thisValue))
-                    {
-                        sb.append(generateConstantDeclarationException(constant.name, methodReturnType,
-                                                                       indentSize + (2*tabSize), tabSize));
-                    }
-                else if (methodReturnType.compareTo("double") == 0 && !Utils.containsOnlyDigitsAndDecimal(thisValue))
-                    {
-                        sb.append(generateConstantDeclarationException(constant.name, methodReturnType,
-                                                                       indentSize + (2*tabSize), tabSize));                            
-                    }
-                else
-                    {
-                        sb.append(indent + tab + tab + "return " + returnPrefix + thisValue + returnPostfix + ";" + cr);
-                    }
-                sb.append(indent + tab + "}" + cr);
-                first = false;
-            }
-        sb.append(indent + tab + "else" + cr);
-        sb.append(indent + tab + "{" + cr);
-        sb.append(indent + tab + tab + "std::stringstream ss;" + cr);
-        sb.append(indent + tab + tab + "ss << \"Constant \\\"" + constant.name +
-                  "\\\" is undefined for AMQP version \" <<" + cr);
-        sb.append(indent + tab + tab + tab + "version.toString() << \".\";" + cr);
-        sb.append(indent + tab + tab + "throw ProtocolVersionException(ss.str());" + cr);
-        sb.append(indent + tab + "}" + cr);
-        sb.append(indent + "}" + cr); 
-        return sb.toString();       
-    }
-        
-    protected String generateConstantDeclarationException(String name, String methodReturnType,
-                                                          int indentSize, int tabSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        sb.append(indent + "std::stringstream ss;" + cr);
-        sb.append(indent + "ss << \"Constant \\\"" + name + "\\\" cannot be converted to type " +
-                  methodReturnType + " for AMQP version \" <<" + cr);        
-        sb.append(indent + tab + "version.toString() << \".\";" + cr);        
-        sb.append(indent + "throw ProtocolVersionException(ss.str());" + cr);        
-        return sb.toString();       
-    }
-        
-    // Methods used for generation of code snippets for Server/ClientOperations class generation
-        
-    protected String generateOpsMethodHandlerGetMethods(AmqpModel model, boolean serverFlag, int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                // Only generate for this class if there is at least one method of the
-                // required chassis (server/client flag).
-                boolean chassisFoundFlag = false;
-                for (String thisMethodName : thisClass.methodMap.keySet())
-                    {
-                        AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                        boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
-                        boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
-                        if ((serverFlag && serverChassisFlag) || (!serverFlag && clientChassisFlag))
-                            chassisFoundFlag = true;
-                    }
-                if (chassisFoundFlag)
-                    {
-                        sb.append(indent + "virtual AMQP_" + (serverFlag ? "Server" : "Client") + "Operations::" +
-                                  thisClass.name + "Handler* get" + thisClass.name + "Handler() = 0;" + cr);
-                    }
-            }
-        return sb.toString();
-    }
-        
-    protected String generateOpsInnerClasses(AmqpModel model, boolean serverFlag, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-                
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        boolean first = true;
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                String handlerClassName = thisClass.name + "Handler";
-                if (!first)
-                    sb.append(cr);
-                sb.append(indent + "// ==================== class " + handlerClassName +
-                          " ====================" + cr);
-                sb.append(indent + "class " + handlerClassName + " : public virtual Invocable");
-                if (thisClass.versionSet.size() != globalVersionSet.size())
-                    sb.append(" // AMQP Version(s) " + thisClass.versionSet + cr);
-                else
-                    sb.append(cr);
-                sb.append(indent + "{" + cr);
-                sb.append(indent + tab + "// Constructors and destructors" + cr);
-                sb.append(indent + "public:" + cr);
-                sb.append(indent + tab + handlerClassName + "(){};\n");
-                sb.append(indent + tab + "virtual ~" + handlerClassName + "() {}" + cr);
-                sb.append(cr);
-                sb.append(indent + tab + "// Protocol methods" + cr);
-                sb.append(cr);
-                sb.append(generateInnerClassMethods(thisClass, serverFlag, true, indentSize + tabSize, tabSize));
-                sb.append(indent + "}; // class " + handlerClassName + cr);
-                first = false;
-            }
-        return sb.toString();           
-    }
-        
-    protected String generateInnerClassMethods(AmqpClass thisClass, boolean serverFlag,
-                                               boolean abstractMethodFlag, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + (abstractMethodFlag ? "Operations" : "Proxy");
-        boolean first = true;
-        for (String thisMethodName : thisClass.methodMap.keySet())
-            {
-                AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                String returnType = "void";
-                boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
-                boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
-                if ((serverFlag && serverChassisFlag) || (!serverFlag && clientChassisFlag))
-                    {
-                        String methodName = parseForReservedWords(method.name, outerClassName + "." + thisClass.name);                          
-                        AmqpOverloadedParameterMap overloadededParameterMap =
-                            method.getOverloadedParameterLists(thisClass.versionSet, this);
-                        for (AmqpOrdinalFieldMap thisFieldMap : overloadededParameterMap.keySet())
-                            {
-                                AmqpVersionSet versionSet = overloadededParameterMap.get(thisFieldMap);
-                                if (!first) sb.append(cr);
-                                sb.append(indent + "virtual "+returnType+" "+ methodName + "(");
-
-                                if (abstractMethodFlag && isSpecialCase(thisClass.name, method.name)) {
-                                    sb.append("const AMQMethodBody& context");
-                                } else {
-                                    sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize), false, true, true));
-                                }
-
-                                sb.append(" )");
-                                if (abstractMethodFlag)
-                                    sb.append(" = 0");
-                                sb.append(";");
-                                if (versionSet.size() != globalVersionSet.size())
-                                    sb.append(" // AMQP Version(s) " + versionSet);
-                                sb.append(cr);
-                                first = false;
-                            }
-                    }
-            }
-        return sb.toString();           
-    }
-        
-    // Methods used for generation of code snippets for Server/ClientProxy class generation
-
-    protected String generateHandlerPointerDefinitions(AmqpModel model, boolean serverFlag,
-                                                       int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Operations";
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                sb.append(indent + outerClassName + "::" + thisClass.name + "Handler* " +
-                          thisClass.name + "HandlerPtr;" + cr);
-            }
-        return sb.toString();
-    }
-    
-    protected String generateHandlerPointerGetMethods(AmqpModel model, boolean serverFlag,
-                                                      int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        String outerClassName = "AMQP_" + (serverFlag ? "Server" : "Client") + "Operations";
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                sb.append(indent + "virtual " + outerClassName + "::" + thisClass.name + "Handler* get" +
-                          thisClass.name + "Handler() { return &" + Utils.firstLower(thisClass.name) + ";}" + cr);
-            }
-        return sb.toString();
-    }
-        
-    public String proxyInstanceName(AmqpClass inner,  String outer) {
-	return parseForReservedWords(Utils.firstLower(inner.name), outer)
-	    + "Proxy";
-    }
-
-    protected String generateProxyInnerClassInstances(AmqpModel model, boolean serverFlag,
-                                                      int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        String outerClassName = proxyOuterClassName(serverFlag);
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                String className = parseForReservedWords(thisClass.name, null);
-                sb.append(indent + className + " " +
-			  proxyInstanceName(thisClass, outerClassName) + ";");
-                if (thisClass.versionSet.size() != globalVersionSet.size())
-                    sb.append(" // AMQP Version(s) " + thisClass.versionSet + cr);
-                else
-                    sb.append(cr);
-            }
-        return sb.toString();
-    }
-        
-    protected String generateProxyInnerClassGetMethodDecls(AmqpModel model, boolean serverFlag,
-                                                           int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                String className = parseForReservedWords(thisClass.name, proxyOuterClassName(serverFlag));
-                sb.append(indent + className + "& get" + className + "();");
-                if (thisClass.versionSet.size() != globalVersionSet.size())
-                    sb.append(" // AMQP Version(s) " + thisClass.versionSet + cr);
-                else
-                    sb.append(cr);
-            }
-        return sb.toString();
-    }
-
-	private String proxyOuterClassName(boolean serverFlag) {
-		return "AMQP_" + (serverFlag ? "Server" : "Client") + "Proxy";
-	}
-        
-    protected String generateProxyInnerClassDeclarations(AmqpModel model, boolean serverFlag,
-                                                        int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        boolean first = true;
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                String className = thisClass.name;
-                if (!first)
-                    sb.append(cr);
-                sb.append(indent + "// ==================== class " + className +
-                          " ====================" + cr);
-                sb.append(indent + "class " + className);
-                if (thisClass.versionSet.size() != globalVersionSet.size())
-                    sb.append(" // AMQP Version(s) " + thisClass.versionSet + cr);
-                else
-                    sb.append(cr);
-                sb.append(indent + "{" + cr);
-                sb.append(indent + "private:" + cr);
-                sb.append(indent + tab + "ChannelAdapter& channel;" + cr);
-                sb.append(cr);
-                sb.append(indent + "public:" + cr);
-                sb.append(indent + tab + "// Constructors and destructors" + cr);
-                sb.append(cr);
-                sb.append(indent + tab + className + "(ChannelAdapter& ch) : " + cr);
-                sb.append(indent + tab + tab + "channel(ch) {}" + cr);
-                sb.append(indent + tab + "virtual ~" + className + "() {}" + cr);
-                sb.append(cr);
-                sb.append(indent + tab + "static "+className+"& get(" + proxyOuterClassName(serverFlag)+"& proxy) { return proxy.get"+className+"();}\n\n");
-                sb.append(indent + tab + "// set for response correlation" + cr);
-                sb.append(cr);
-                sb.append(indent + tab + "// Protocol methods" + cr);
-                sb.append(cr);
-                sb.append(generateInnerClassMethods(thisClass, serverFlag, false, indentSize + tabSize, tabSize));
-                sb.append(indent + "}; // class " + className + cr);
-                first = false;
-            }
-        return sb.toString();
-    }
-        
-    protected String generateProxyConstructorInitializers(AmqpModel model, boolean serverFlag,
-                                                          int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        Iterator<String> cItr = model.classMap.keySet().iterator();
-        while (cItr.hasNext())
-            {
-                AmqpClass thisClass = model.classMap.get(cItr.next());
-                sb.append(",\n");
-                sb.append(indent + proxyInstanceName(thisClass, proxyOuterClassName(serverFlag))
-			  + "(channel)");
-            }
-	sb.append("\n");
-        return sb.toString();   
-    }
-        
-    protected String generateProxyInnerClassGetMethodImpls(AmqpModel model, boolean serverFlag,
-                                                           int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        String outerClassName = proxyOuterClassName(serverFlag);
-        Iterator<String> cItr = model.classMap.keySet().iterator();
-        while (cItr.hasNext())
-            {
-                AmqpClass thisClass = model.classMap.get(cItr.next());
-                String className = thisClass.name;
-                sb.append(indent + outerClassName + "::" + className + "& " +
-                          outerClassName + "::get" + className + "()" + cr);
-                sb.append(indent + "{" + cr);
-                if (thisClass.versionSet.size() != globalVersionSet.size())
-                    {
-                        sb.append(indent + tab + "if (!" + generateVersionCheck(thisClass.versionSet) + ")" + cr);
-                        sb.append(indent + tab + tab + "throw new ProtocolVersionException();" + cr);
-                    }
-                sb.append(indent + tab + "return " +
-			  proxyInstanceName(thisClass, outerClassName) + ";" + cr);
-                sb.append(indent + "}" + cr);
-                if (cItr.hasNext())
-                    sb.append(cr);
-            }
-        return sb.toString();
-    }
-        
-    protected String generateProxyInnerClassImpl(AmqpModel model, boolean serverFlag,
-                                                 int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        boolean firstClassFlag = true;
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                String className = thisClass.name;
-                if (!firstClassFlag)
-                    sb.append(cr);
-                sb.append(indent + "// ==================== class " + className +
-                          " ====================" + cr);
-                sb.append(generateInnerClassMethodImpls(thisClass, serverFlag, indentSize, tabSize));
-                firstClassFlag = false;
-            }
-        return sb.toString();
-    }
-        
-    protected String generateInnerClassMethodImpls(AmqpClass thisClass, boolean serverFlag,
-                                                   int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        String outerclassName = proxyOuterClassName(serverFlag);
-        boolean first = true;
-        for (String thisMethodName : thisClass.methodMap.keySet())
-            {
-                AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                String methodBodyClassName = thisClass.name + Utils.firstUpper(method.name) + "Body";
-                boolean clientChassisFlag = method.clientMethodFlagMap.isSet();
-                boolean serverChassisFlag = method.serverMethodFlagMap.isSet();
-                boolean versionConsistentFlag = method.isVersionConsistent(globalVersionSet);
-                if ((serverFlag && serverChassisFlag) || (!serverFlag && clientChassisFlag))
-                    {
-                        String methodName = parseForReservedWords(method.name, outerclassName + "." + thisClass.name);
-                        AmqpOverloadedParameterMap overloadededParameterMap =
-                            method.getOverloadedParameterLists(thisClass.versionSet, this);
-                        for (AmqpOrdinalFieldMap thisFieldMap : overloadededParameterMap.keySet())
-                            {
-                                AmqpVersionSet versionSet = overloadededParameterMap.get(thisFieldMap);
-                                if (!first)
-                                    sb.append(cr);
-                                String returnType =  "void";
-                                sb.append(indent + returnType + " " + outerclassName + "::" + thisClass.name + "::" +
-                                          methodName + "(");
-                                sb.append(generateMethodParameterList(thisFieldMap, indentSize + (5*tabSize), false, true, true));
-                                sb.append(")");
-                                if (versionSet.size() != globalVersionSet.size())
-                                    sb.append(" // AMQP Version(s) " + versionSet);
-                                sb.append(cr);
-                                sb.append(indent + "{" + cr);
-                                sb.append(generateMethodBodyCallContext(method, thisFieldMap, outerclassName, methodBodyClassName,
-                                                                        versionConsistentFlag, versionSet, indentSize + tabSize, tabSize));
-                                sb.append(indent + "}" + cr);
-                                sb.append(cr);
-                                first = false;
-                            }
-                    }
-            }
-        return sb.toString();           
-    }
-        
-    protected String generateMethodBodyCallContext(AmqpMethod method, AmqpOrdinalFieldMap fieldMap, String outerclassName,
-                                                   String methodBodyClassName, boolean versionConsistentFlag, AmqpVersionSet versionSet,
-                                                   int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        if (versionConsistentFlag)
-            {
-                sb.append(generateProxyMethodBody(method, fieldMap, methodBodyClassName, null, indentSize, tabSize));
-            }
-        else
-            {
-                boolean firstOverloadedMethodFlag = true;
-                for (AmqpVersion thisVersion : versionSet)
-                    {
-                        sb.append(indent);
-                        if (!firstOverloadedMethodFlag)
-                            sb.append("else ");
-                        sb.append("if (" + generateVersionCheck(thisVersion) + ")" + cr);
-                        sb.append(indent + "{" + cr);
-                        sb.append(generateProxyMethodBody(method, fieldMap, methodBodyClassName, thisVersion,
-                                                         indentSize + tabSize, tabSize));
-                        sb.append(indent + "}" + cr);
-                        firstOverloadedMethodFlag = false;
-                    }
-                sb.append(indent + "else" + cr);
-                sb.append(indent + "{" + cr);
-                sb.append(indent + tab + "std::stringstream ss;" + cr);
-                sb.append(indent + tab + "ss << \"Call to " + outerclassName + "::" + methodBodyClassName +
-                          "(u_int16_t" + generateMethodParameterList(fieldMap, 0, true, true, false) + ")\"" + cr);
-                sb.append(indent + tab + tab + "<< \" is invalid for AMQP version \" << version.toString() << \".\";" + cr);
-                sb.append(indent + tab + "throw new ProtocolVersionException(ss.str());" + cr);
-                sb.append(indent + "}" + cr);
-            }
-        return sb.toString();           
-    }
-        
-    protected String generateProxyMethodBody(AmqpMethod method, AmqpOrdinalFieldMap fieldMap, String methodBodyClassName,
-                                            AmqpVersion version, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        String namespace = version != null ? version.namespace() + "::" : "";
-        StringBuffer sb = new StringBuffer();
-        sb.append(indent+tab+"channel.send(make_shared_ptr(new ");
-        sb.append(namespace + methodBodyClassName + "( channel.getVersion()");
-        sb.append(generateMethodParameterList(fieldMap, indentSize + (5*tabSize), true, false, true));
-        sb.append(")));\n");
-        return sb.toString();           
-    }
-    
-    protected String generateMethodBodyIncludes(AmqpClass thisClass, int indentSize)
-    {
-        StringBuffer sb = new StringBuffer();
-        if (thisClass != null)
-            {
-                sb.append(generateClassMethodBodyInclude(thisClass, indentSize));
-            }
-        else
-            {
-                for (String thisClassName : model.classMap.keySet())
-                    {
-                        thisClass = model.classMap.get(thisClassName);
-                        sb.append(generateClassMethodBodyInclude(thisClass, indentSize));
-                    }
-            }
-        return sb.toString();       
-    }
-    
-    protected String generateClassMethodBodyInclude(AmqpClass thisClass, int indentSize)
-    {
-        StringBuffer sb = new StringBuffer();
-        String indent = Utils.createSpaces(indentSize);
-        for (String thisMethodName : thisClass.methodMap.keySet())
-            {
-                AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                sb.append(indent + "#include \"" + thisClass.name +
-                          Utils.firstUpper(method.name) + "Body.h\"" + cr);
-            }
-        return sb.toString();       
-    }
-    
-    // Methods used for generation of code snippets for MethodBody class generation
-
-    protected String getIndex(AmqpOrdinalVersionMap indexMap, AmqpVersion version)
-        throws AmqpTemplateException
-    {
-        for (Integer thisIndex : indexMap.keySet())
-            {
-                AmqpVersionSet versionSet = indexMap.get(thisIndex);
-                if (versionSet.contains(version))
-                    return String.valueOf(thisIndex);                   
-            }
-        throw new AmqpTemplateException("Unable to find index for version " + version); 
-    }
-        
-    protected String generateFieldDeclarations(AmqpFieldMap fieldMap, AmqpVersion version, int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        
-        if (version == null)
-            version = globalVersionSet.first();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
-        for (Integer thisOrdinal : ordinalFieldMap.keySet())
-            {
-                String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal);
-                sb.append(indent + fieldDomainPair[FIELD_CODE_TYPE] + " " + fieldDomainPair[FIELD_NAME] + ";" + cr);            
-            }
-        return sb.toString();
-    }
-        
-    protected String generateFieldGetMethods(AmqpFieldMap fieldMap, AmqpVersion version, int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-                
-        if (version == null)
-            version = globalVersionSet.first();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
-        for (Integer thisOrdinal : ordinalFieldMap.keySet())
-            {
-                String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal);
-                sb.append(indent + "" + setRef(fieldDomainPair[FIELD_CODE_TYPE]) + " get" +
-                          Utils.firstUpper(fieldDomainPair[FIELD_NAME]) + "() const { return " +
-                          fieldDomainPair[FIELD_NAME] + "; }" + cr);
-            }
-        return sb.toString();
-    }
-        
-    protected String generatePrintMethodContents(AmqpFieldMap fieldMap, AmqpVersion version, int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-                
-        if (version == null)
-            version = globalVersionSet.first();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
-        boolean firstFlag = true;
-        for (Integer thisOrdinal : ordinalFieldMap.keySet())
-            {
-                String[] fieldDomainPair = ordinalFieldMap.get(thisOrdinal);
-                String cast = fieldDomainPair[FIELD_CODE_TYPE].compareTo("u_int8_t") == 0 ? "(int)" : "";
-                sb.append(indent + "out << \"");
-                if (!firstFlag)
-                    sb.append("; ");
-                sb.append(fieldDomainPair[FIELD_NAME] + "=\" << " + cast + fieldDomainPair[FIELD_NAME] + ";" + cr);
-                firstFlag = false;
-            }
-        return sb.toString();           
-    }
-        
-    protected String generateBodySizeMethodContents(AmqpFieldMap fieldMap, AmqpVersion version,
-                                                    int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        ArrayList<String> bitFieldList = new ArrayList<String>();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, false, this);
-        Iterator<Integer> oItr = ordinalFieldMap.keySet().iterator();
-        int ordinal = 0;
-        while (oItr.hasNext())
-            {
-                ordinal = oItr.next();
-                String[] fieldDomainPair = ordinalFieldMap.get(ordinal);
-                AmqpVersion thisVersion = version == null ? globalVersionSet.first() : version;
-                String domainType = getDomainType(fieldDomainPair[FIELD_CODE_TYPE], thisVersion);
-                        
-                // Defer bit types by adding them to an array. When the first subsequent non-bit
-                // type is encountered, then handle the bits. This allows consecutive bits to be
-                // placed into the same byte(s) - 8 bits to the byte.
-                if (domainType.compareTo("bit") == 0)
-                    {
-                        bitFieldList.add(fieldDomainPair[FIELD_NAME]);
-                    }
-                else
-                    {
-                        if (bitFieldList.size() > 0) // Handle accumulated bit types (if any)
-                            {
-                                sb.append(generateBitArrayBodySizeMethodContents(bitFieldList, ordinal, indentSize));
-                            }
-                        sb.append(indent + "sz += " +
-                                  typeMap.get(domainType).size.replaceAll("#", fieldDomainPair[FIELD_NAME]) +
-                                  "; /* " + fieldDomainPair[FIELD_NAME] + ": " +
-                                  domainType + " */" + cr);
-                    }
-            }
-        if (bitFieldList.size() > 0) // Handle any remaining accumulated bit types
-            {
-                sb.append(generateBitArrayBodySizeMethodContents(bitFieldList, ordinal, indentSize));
-            }
-        return sb.toString();                           
-    }
-
-    protected String generateBitArrayBodySizeMethodContents(ArrayList<String> bitFieldList,
-                                                            int ordinal, int indentSize)
-    {
-        int numBytes = ((bitFieldList.size() - 1) / 8) + 1;
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        String comment = bitFieldList.size() == 1 ?
-            bitFieldList.get(0) + ": bit" :
-            "Combinded bits: " + bitFieldList;
-        sb.append(indent + "sz += " +
-                  typeMap.get("bit").size.replaceAll("~", String.valueOf(numBytes)) +
-                  "; /* " + comment + " */" + cr);
-        bitFieldList.clear();           
-        return sb.toString();                           
-    }
-        
-    protected String generateEncodeMethodContents(AmqpFieldMap fieldMap, AmqpVersion version,
-                                                  int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        ArrayList<String> bitFieldList = new ArrayList<String>();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, false, this);
-        Iterator<Integer> oItr = ordinalFieldMap.keySet().iterator();
-        int ordinal = 0;
-        while (oItr.hasNext())
-            {
-                ordinal = oItr.next();
-                String[] fieldDomainPair = ordinalFieldMap.get(ordinal);
-                AmqpVersion thisVersion = version == null ? globalVersionSet.first() : version;
-                String domainType = getDomainType(fieldDomainPair[FIELD_CODE_TYPE], thisVersion);
-                        
-                // Defer bit types by adding them to an array. When the first subsequent non-bit
-                // type is encountered, then handle the bits. This allows consecutive bits to be
-                // placed into the same byte(s) - 8 bits to the byte.
-                if (domainType.compareTo("bit") == 0)
-                    {
-                        bitFieldList.add(fieldDomainPair[FIELD_NAME]);
-                    }
-                else
-                    {
-                        if (bitFieldList.size() > 0) // Handle accumulated bit types (if any)
-                            {
-                                sb.append(generateBitEncodeMethodContents(bitFieldList, ordinal, indentSize));
-                            }
-                        sb.append(indent +
-                                  typeMap.get(domainType).encodeExpression.replaceAll("#", fieldDomainPair[FIELD_NAME]) +
-                                  "; /* " + fieldDomainPair[FIELD_NAME] + ": " + domainType + " */"+ cr);
-                    }
-            }
-        if (bitFieldList.size() > 0) // Handle any remaining accumulated bit types
-            {
-                sb.append(generateBitEncodeMethodContents(bitFieldList, ordinal, indentSize));
-            }
-                
-        return sb.toString();                           
-    }
-        
-    protected String generateBitEncodeMethodContents(ArrayList<String> bitFieldList, int ordinal,
-                                                     int indentSize)
-    {
-        int numBytes = ((bitFieldList.size() - 1) / 8) + 1;
-        String indent = Utils.createSpaces(indentSize);
-        String bitArrayName = "flags_" + ordinal;
-        StringBuffer sb = new StringBuffer(indent + "u_int8_t " + bitArrayName +
-                                           "[" + numBytes + "] = {0};" + 
-                                           (numBytes != 1 ? " /* All array elements will be initialized to 0 */" : "") +
-                                           cr);
-        for (int i=0; i<bitFieldList.size(); i++)
-            {
-                int bitIndex = i%8;
-                int byteIndex = i/8;
-                sb.append(indent + bitArrayName + "[" + byteIndex + "] |= " + bitFieldList.get(i) +
-                          " << " + bitIndex + "; /* " + bitFieldList.get(i) + ": bit */" + cr);
-            }
-        for (int i=0; i<numBytes; i++)
-            {
-                sb.append(indent + "buffer.putOctet(" + bitArrayName + "[" + i + "]);" + cr);
-            }   
-        bitFieldList.clear();           
-        return sb.toString();                           
-    }
-
-    protected String generateDecodeMethodContents(AmqpFieldMap fieldMap, AmqpVersion version,
-                                                  int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        ArrayList<String> bitFieldList = new ArrayList<String>();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, false, this);
-        Iterator<Integer> oItr = ordinalFieldMap.keySet().iterator();
-        int ordinal = 0;
-        while (oItr.hasNext())
-            {
-                ordinal = oItr.next();
-                String[] fieldDomainPair = ordinalFieldMap.get(ordinal);
-                AmqpVersion thisVersion = version == null ? globalVersionSet.first() : version;
-                String domainType = getDomainType(fieldDomainPair[FIELD_CODE_TYPE], thisVersion);
-                        
-                // Defer bit types by adding them to an array. When the first subsequent non-bit
-                // type is encountered, then handle the bits. This allows consecutive bits to be
-                // placed into the same byte(s) - 8 bits to the byte.
-                if (domainType.compareTo("bit") == 0)
-                    {
-                        bitFieldList.add(fieldDomainPair[FIELD_NAME]);
-                    }
-                else
-                    {
-                        if (bitFieldList.size() > 0) // Handle accumulated bit types (if any)
-                            {
-                                sb.append(generateBitDecodeMethodContents(bitFieldList, ordinal, indentSize));
-                            }
-                        sb.append(indent +
-                                  typeMap.get(domainType).decodeExpression.replaceAll("#", fieldDomainPair[FIELD_NAME]) +
-                                  "; /* " + fieldDomainPair[FIELD_NAME] + ": " + domainType + " */" + cr);
-                    }
-            }
-        if (bitFieldList.size() > 0) // Handle any remaining accumulated bit types
-            {
-                sb.append(generateBitDecodeMethodContents(bitFieldList, ordinal, indentSize));
-            }
-                
-        return sb.toString();                           
-    }
-        
-    protected String generateBitDecodeMethodContents(ArrayList<String> bitFieldList, int ordinal,
-                                                     int indentSize)
-    {
-        int numBytes = ((bitFieldList.size() - 1) / 8) + 1;
-        String indent = Utils.createSpaces(indentSize);
-        String bitArrayName = "flags_" + ordinal;
-        StringBuffer sb = new StringBuffer(indent + "u_int8_t " + bitArrayName +
-                                           "[" + numBytes + "];" + cr); 
-        for (int i=0; i<numBytes; i++)
-            {
-                sb.append(indent + bitArrayName + "[" + i + "] = buffer.getOctet();" + cr);
-            }
-        for (int i=0; i<bitFieldList.size(); i++)
-            {
-                int bitIndex = i%8;
-                int byteIndex = i/8;
-                sb.append(indent + bitFieldList.get(i) + " = (1 << " + bitIndex + ") & " +
-                          bitArrayName + "[" + byteIndex + "]; /* " + bitFieldList.get(i) +
-                          ": bit */" + cr);
-            }
-        bitFieldList.clear();           
-        return sb.toString();                           
-    }
-        
-    protected String generateFieldList(AmqpFieldMap fieldMap, AmqpVersion version, boolean defineFlag,
-                                       boolean initializerFlag, int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        AmqpOrdinalFieldMap ordinalFieldMap = fieldMap.getMapForVersion(version, true, this);
-        Iterator<Integer> oItr = ordinalFieldMap.keySet().iterator();
-        while (oItr.hasNext())
-            {
-                int ordinal = oItr.next();
-                String[] fieldDomainPair = ordinalFieldMap.get(ordinal);
-                sb.append(indent + (defineFlag ? setRef(fieldDomainPair[FIELD_CODE_TYPE]) + " " : "") +
-                          fieldDomainPair[FIELD_NAME] + (initializerFlag ? "(" + fieldDomainPair[FIELD_NAME] + ")" : "") +
-                          (oItr.hasNext() ? "," : "") + cr);
-            }
-        return sb.toString();                           
-    }
-        
-    protected String generateMethodParameterList(AmqpOrdinalFieldMap fieldMap, int indentSize,
-                                                 boolean leadingCommaFlag, boolean fieldTypeFlag, boolean fieldNameFlag)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        boolean first = true;
-        Iterator<Integer> pItr = fieldMap.keySet().iterator();
-        while(pItr.hasNext())
-            {
-                String[] field = fieldMap.get(pItr.next());
-                if (first && leadingCommaFlag)
-                    {
-                        sb.append("," + (fieldNameFlag ? cr : " "));
-                    }
-                if (!first || leadingCommaFlag)
-                    {
-                        sb.append(indent);
-                    }
-                sb.append(
-                          (fieldTypeFlag ? setRef(field[FIELD_CODE_TYPE]) : "") +
-                          (fieldNameFlag ? " " + field[FIELD_NAME] : "") +
-                          (pItr.hasNext() ? "," + (fieldNameFlag ? cr : " ") : ""));
-                first = false;
-            }
-        return sb.toString();           
-    }
-    
-    protected String generateConstructor(AmqpClass thisClass, AmqpMethod method,
-                                         AmqpVersion version, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        if (method.fieldMap.size() > 0)
-            {
-                sb.append(indent + thisClass.name + Utils.firstUpper(method.name) + "Body(ProtocolVersion," + cr);
-		sb.append(generateFieldList(method.fieldMap, version, true, false, 8));
-                sb.append(indent + tab + ")"); 
-		if (method.fieldMap.size() > 0) {
-		    sb.append(" : ");
-		    sb.append(generateFieldList(method.fieldMap, version, false, true, 8));
-		}
-                sb.append(indent + "{ }\n");
-            }
-        return sb.toString();         
-    }
-    
-    protected String generateServerOperationsInvoke(AmqpClass thisClass, AmqpMethod method,
-                                                    AmqpVersion version, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        boolean special = isSpecialCase(thisClass.name, method.name);
-        
-        if (method.serverMethodFlagMap.size() > 0) // At least one AMQP version defines this method as a server method
-            {
-                Iterator<Boolean> bItr = method.serverMethodFlagMap.keySet().iterator();
-                while (bItr.hasNext())
-                    {
-                        if (bItr.next()) // This is a server operation
-                            {
-                                boolean fieldMapNotEmptyFlag = method.fieldMap.size() > 0;
-                                sb.append(indent + "void invoke(AMQP_ServerOperations& target)\n");
-                                sb.append(indent + "{" + cr);
-                                sb.append(indent + tab + "target.get" + thisClass.name + "Handler()->" +
-                                          parseForReservedWords(Utils.firstLower(method.name),
-                                                                thisClass.name + Utils.firstUpper(method.name) + "Body.invoke()") + "(");
-                                if (special) 
-                                    {
-                                        sb.append("*this");                    
-                                    }
-                                else if (fieldMapNotEmptyFlag)
-                                    {
-                                        sb.append(generateFieldList(method.fieldMap, version, false, false, indentSize + 4*tabSize));
-                                        sb.append(indent + tab + tab + tab + tab);                    
-                                    }
-                                sb.append(");" + cr);
-                                sb.append(indent + "}" + cr);
-                            }
-                    }
-            }
-        return sb.toString();       
-    }
-    
-    protected String generateServerOperationsInvoke2(AmqpClass thisClass, AmqpMethod method,
-                                                    AmqpVersion version, int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        String ptrType = "AMQP_ServerOperations:: " + thisClass.name + "Handler*";
-        if (isSpecialCase(thisClass.name, method.name)) {
-            sb.append(indent + "bool invoke(Invocable*)" + cr);
-            sb.append(indent + "{" + cr);
-            sb.append(indent + tab + "return false;" + cr);
-            sb.append(indent + "}" + cr);
-        } else if (method.serverMethodFlagMap.size() > 0) { // At least one AMQP version defines this method as a server method
-            
-            Iterator<Boolean> bItr = method.serverMethodFlagMap.keySet().iterator();
-            while (bItr.hasNext())
-                {
-                    if (bItr.next()) // This is a server operation
-                        {
-                            boolean fieldMapNotEmptyFlag = method.fieldMap.size() > 0;
-                            sb.append(indent + "bool invoke(Invocable* target)" + cr);
-                            sb.append(indent + "{" + cr);
-                            sb.append(indent + tab + ptrType + " ptr = dynamic_cast<" + ptrType + ">(target);" + cr);
-                            sb.append(indent + tab + "if (ptr) {" + cr);
-                            sb.append(indent + tab + tab + "ptr->");
-                            sb.append(parseForReservedWords(Utils.firstLower(method.name),null) + "(" + cr);
-                            if (fieldMapNotEmptyFlag)
-                                {
-                                        sb.append(generateFieldList(method.fieldMap, version, false, false, indentSize + 4*tabSize));
-                                        sb.append(indent + tab + tab + tab + tab);                    
-                                }
-                            sb.append(");" + cr);
-                            sb.append(indent + tab + tab + "return true;" + cr);
-                            sb.append(indent + tab + "} else {" + cr);
-                            sb.append(indent + tab + tab + "return false;" + cr);
-                            sb.append(indent + tab + "}" + cr);
-                            sb.append(indent + "}" + cr);
-                        }
-                }
-        }
-        return sb.toString();       
-    }
-    
-    // Methods for generation of code snippets for amqp_methods.h/cpp files
-    
-    protected String generateMethodBodyIncludeList(AmqpModel model, int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                for (String thisMethodName : thisClass.methodMap.keySet())
-                    {
-                        AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                        sb.append(indent + "#include \"" + thisClass.name + Utils.firstUpper(method.name) + "Body.h\"" + cr);
-                    }
-            }
-        
-        return sb.toString();       
-    }
-    
-    protected String generateMethodBodyInstances(AmqpModel model, int indentSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        
-        for (String thisClassName : model.classMap.keySet())
-            {
-                AmqpClass thisClass = model.classMap.get(thisClassName);
-                for (String thisMethodName : thisClass.methodMap.keySet())
-                    {
-                        AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                        sb.append(indent + "const " + thisClass.name + Utils.firstUpper(method.name) + "Body " +
-                                  Utils.firstLower(thisClass.name) + "_" + method.name + ";" + cr);
-                    }
-            }
-       
-        return sb.toString();       
-    }
-    
-    protected String generateMethodBodyMapEntry(AmqpModel model, int indentSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        
-        for (AmqpVersion version : globalVersionSet)
-            {
-                for (String thisClassName : model.classMap.keySet())
-                    {
-                        AmqpClass thisClass = model.classMap.get(thisClassName);
-                        for (String thisMethodName : thisClass.methodMap.keySet())
-                            {
-                                AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                                String namespace = method.isVersionConsistent(globalVersionSet) ? "" : version.namespace() + "::";
-                                try
-                                    {
-                                        int classOrdinal = thisClass.indexMap.getOrdinal(version);
-                                        int methodOrdinal = method.indexMap.getOrdinal(version);
-                                        String methodModyClassName = namespace + thisClass.name + Utils.firstUpper(method.name) + "Body";
-                                        sb.append(indent + "insert(std::make_pair(createMapKey(" + classOrdinal + ", " +
-                                                  methodOrdinal + ", " + version.getMajor() + ", " + version.getMinor() +
-                                                  "), &createMethodBodyFn<" + methodModyClassName + ">));" + cr);
-                                    }
-                                catch (AmqpTypeMappingException e) {} // ignore
-                            }
-                    }
-            }
-        
-        return sb.toString();       
-    }
-   
-    
-    // Helper functions
-        
-    private String generateVersionCheck(AmqpVersion version)
-    {
-        return "version.equals(" + version.getMajor() + ", " + version.getMinor() + ")";
-    }
-        
-    private String generateVersionCheck(AmqpVersionSet versionSet)
-        throws AmqpTypeMappingException
-    {
-        StringBuffer sb = new StringBuffer();
-        for (AmqpVersion v : versionSet)
-            {
-                if (!v.equals(versionSet.first()))
-                    sb.append(" || ");
-                if (versionSet.size() > 1)
-                    sb.append("(");
-                sb.append("version.equals(" + v.getMajor() + ", " + v.getMinor() + ")");
-                if (versionSet.size() > 1)
-                    sb.append(")");
-            }
-        return sb.toString();
-    }
-        
-    private String parseForReservedWords(String name, String context)
-    {
-        for (String cppReservedWord : cppReservedWords)
-            if (name.compareTo(cppReservedWord) == 0)
-                {
-                    if (!quietFlag)
-                        {
-                            System.out.println("WARNING: " + (context == null ? "" : context + ": ") +
-                                               "Found XML method \"" + name + "\", which is a C++ reserved word. " +
-                                               "Changing generated name to \"" + name + "_\".");
-                        }
-                    return name + "_";
-                }
-        
-        for (String cppCommonDefine : cppCommonDefines)
-            if (name.compareTo(cppCommonDefine) == 0)
-                {
-                    if (!quietFlag)
-                        {
-                            System.out.println("WARNING: " + (context == null ? "" : context + ": ") +
-                                               "Found XML method \"" + name + "\", which may clash with commonly used defines within C++. " +
-                                               "Changing generated name to \"" + name + "_\".");
-                        }
-                    return name + "_";
-                }
-       
-        return name;
-    }
-        
-    private String setRef(String codeType)
-    {
-        if (codeType.equals("string")  ||
-            codeType.equals("FieldTable") ||
-            codeType.equals("Content"))
-            return "const " + codeType + "&";
-        return codeType;
-    }
-                
-    private String camelCaseName(String name, boolean upperFirstFlag)
-    {
-        StringBuffer ccn = new StringBuffer();
-        String[] toks = name.split("[-_.\\ ]");
-        for (int i=0; i<toks.length; i++)
-            {
-                StringBuffer b = new StringBuffer(toks[i]);
-                if (upperFirstFlag || i>0)
-                    b.setCharAt(0, Character.toUpperCase(toks[i].charAt(0)));
-                ccn.append(b);
-            }
-        return ccn.toString();
-    }
-
-    private boolean isSpecialCase(String className, String methodName) 
-    {
-        return "message".equalsIgnoreCase(className) && ("transfer".equalsIgnoreCase(methodName) || "append".equalsIgnoreCase(methodName));
-    }
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
deleted file mode 100644
index 505a70dc85..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.TreeMap;
-
-public class DotnetGenerator extends Generator
-{
-	private class DomainInfo
-	{
-		public String type;
-		public String size;
-		public String encodeExpression;
-		public String decodeExpression;
-		public DomainInfo(String domain, String size, String encodeExpression, String decodeExpression)
-		{
-			this.type = domain;
-			this.size = size;
-			this.encodeExpression = encodeExpression;
-			this.decodeExpression = decodeExpression;
-		}
-	}
-	
-	private static TreeMap<String, DomainInfo> typeMap = new TreeMap<String, DomainInfo>();
-
-	public DotnetGenerator(AmqpVersionSet versionList)
-	{
-		super(versionList);
-		// Load .NET type and size maps.
-		// Adjust or add to these lists as new types are added/defined.
-		// The char '#' will be replaced by the field variable name (any type).
-		// The char '~' will be replaced by the compacted bit array size (type bit only).
-		// TODO: I have left a copy of the Java typeMap here - replace with appropriate .NET values.
-		typeMap.put("bit", new DomainInfo(
-			"boolean",										// .NET code type
-			"~",											// size
-			"EncodingUtils.writeBooleans(buffer, #)",		// encode expression
-			"# = EncodingUtils.readBooleans(buffer)"));		// decode expression
-		typeMap.put("content", new DomainInfo(
-			"Content",										// .NET code type
-			"EncodingUtils.encodedContentLength(#)", 	// size
-			"EncodingUtils.writeContentBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readContent(buffer)"));	// decode expression
-		typeMap.put("long", new DomainInfo(
-			"long",											// .NET code type
-			"4",											// size
-			"EncodingUtils.writeUnsignedInteger(buffer, #)", // encode expression
-			"# = buffer.getUnsignedInt()")); 				// decode expression
-		typeMap.put("longlong", new DomainInfo(
-			"long",											// .NET code type
-			"8",											// size
-			"buffer.putLong(#)", 							// encode expression
-			"# = buffer.getLong()")); 						// decode expression
-		typeMap.put("longstr", new DomainInfo(
-			"byte[]",										// .NET code type
-			"EncodingUtils.encodedLongstrLength(#)", 		// size
-			"EncodingUtils.writeLongStringBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readLongstr(buffer)"));		// decode expression
-		typeMap.put("octet", new DomainInfo(
-			"short",										// .NET code type
-			"1",											// size
-			"EncodingUtils.writeUnsignedByte(buffer, #)",	// encode expression
-			"# = buffer.getUnsigned()")); 					// decode expression
-		typeMap.put("short", new DomainInfo(
-			"int",											// .NET code type
-			"2",											// size
-			"EncodingUtils.writeUnsignedShort(buffer, #)",	// encode expression
-			"# = buffer.getUnsignedShort()")); 				// decode expression
-		typeMap.put("shortstr", new DomainInfo(
-			"AMQShortString",								// .NET code type
-			"EncodingUtils.encodedShortStringLength(#)",	// size
-			"EncodingUtils.writeShortStringBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readAMQShortString(buffer)"));	// decode expression
-		typeMap.put("table", new DomainInfo(
-			"FieldTable",									// .NET code type
-			"EncodingUtils.encodedFieldTableLength(#)", 	// size
-			"EncodingUtils.writeFieldTableBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readFieldTable(buffer)"));	// decode expression
-		typeMap.put("timestamp", new DomainInfo(
-			"long",											// .NET code type
-			"8",											// size
-			"EncodingUtils.writeTimestamp(buffer, #)",		// encode expression
-			"# = EncodingUtils.readTimestamp(buffer)"));	// decode expression
-	}
-
-	@Override
-	protected String prepareFilename(String filenameTemplate,
-			AmqpClass thisClass, AmqpMethod method, AmqpField field)
-	{
-		StringBuffer sb = new StringBuffer(filenameTemplate);
-		if (thisClass != null)
-			replaceToken(sb, "${CLASS}", thisClass.name);
-		if (method != null)
-			replaceToken(sb, "${METHOD}", method.name);
-		if (field != null)
-			replaceToken(sb, "${FIELD}", field.name);
-		return sb.toString();
-	}
-
-	@Override
-	protected void processClassList(StringBuffer sb, int listMarkerStartIndex,
-			int listMarkerEndIndex, AmqpModel model)
-			throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		String codeSnippet;
-		int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-		String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-		int tokStart = tline.indexOf('$');
-		String token = tline.substring(tokStart).trim();
-		sb.delete(listMarkerStartIndex, lend);
-		
-		// TODO: Add in tokens and calls to their corresponding generator methods here...
-		if (token.compareTo("${??????????}") == 0)
-		{
-			codeSnippet = token; // This is a stub to get the compile working - remove when gen method is present.
-//			codeSnippet = generateRegistry(model, 8, 4); 
-		}
-		
-		else // Oops!
-		{
-			throw new AmqpTemplateException("Template token " + token + " unknown.");
-		}
-		sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-
-	@Override
-	protected void processConstantList(StringBuffer sb,
-			int listMarkerStartIndex, int listMarkerEndIndex,
-			AmqpConstantSet constantSet) throws AmqpTemplateException,
-			AmqpTypeMappingException
-	{
-        String codeSnippet;
-        int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-        String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-        int tokStart = tline.indexOf('$');
-        String token = tline.substring(tokStart).trim();
-        sb.delete(listMarkerStartIndex, lend);
-
-		// TODO: Add in tokens and calls to their corresponding generator methods here...
-        if (token.compareTo("${??????????}") == 0)
-        {
-			codeSnippet = token; // This is a stub to get the compile working - remove when gen method is present.
-//            codeSnippet = generateConstantGetMethods(constantSet, 4, 4); 
-        }
-       
-        else // Oops!
-        {
-            throw new AmqpTemplateException("Template token " + token + " unknown.");
-        }
-        sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-
-	@Override
-	protected void processFieldList(StringBuffer sb, int listMarkerStartIndex,
-			int listMarkerEndIndex, AmqpFieldMap fieldMap, AmqpVersion version)
-			throws AmqpTypeMappingException, AmqpTemplateException,
-			IllegalAccessException, InvocationTargetException
-	{
-		String codeSnippet;
-		int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-		String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-		int tokStart = tline.indexOf('$');
-		String token = tline.substring(tokStart).trim();
-		sb.delete(listMarkerStartIndex, lend);
-		
-		// TODO: Add in tokens and calls to their corresponding generator methods here...
-		if (token.compareTo("${??????????}") == 0)
-		{
-			codeSnippet = token; // This is a stub to get the compile working - remove when gen method is present.
-//			codeSnippet = fieldMap.parseFieldMap(declarationGenerateMethod,
-//				mangledDeclarationGenerateMethod, 4, 4, this);
-		}
-		
-		else // Oops!
-		{
-			throw new AmqpTemplateException("Template token " + token + " unknown.");
-		}
-		sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-
-	@Override
-	protected void processMethodList(StringBuffer sb, int listMarkerStartIndex,
-			int listMarkerEndIndex, AmqpClass thisClass)
-			throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		String codeSnippet;
-		int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-		String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-		int tokStart = tline.indexOf('$');
-		String token = tline.substring(tokStart).trim();
-		sb.delete(listMarkerStartIndex, lend);
-		
-		// TODO: Add in tokens and calls to their corresponding generator methods here...
-		if (token.compareTo("${??????????}") == 0)
-		{
-			codeSnippet = token; // This is a stub to get the compile working - remove when gen method is present.
-		}
-		
-		else // Oops!
-		{
-			throw new AmqpTemplateException("Template token " + token + " unknown.");
-		}
-		sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-
-	@Override
-	protected void processTemplateA(String[] template) throws IOException,
-			AmqpTemplateException, AmqpTypeMappingException,
-			IllegalAccessException, InvocationTargetException
-	{
-		// I've put in the Java model here - this can be changed if a different pattern is required.
-		processTemplateD(template, null, null, null);
-	}
-
-	@Override
-	protected void processTemplateB(String[] template, AmqpClass thisClass)
-			throws IOException, AmqpTemplateException,
-			AmqpTypeMappingException, IllegalAccessException,
-			InvocationTargetException
-	{
-		// I've put in the Java model here - this can be changed if a different pattern is required.
-		processTemplateD(template, thisClass, null, null);
-	}
-
-	@Override
-	protected void processTemplateC(String[] template, AmqpClass thisClass,
-			AmqpMethod method) throws IOException, AmqpTemplateException,
-			AmqpTypeMappingException, IllegalAccessException,
-			InvocationTargetException
-	{
-		// I've put in the Java model here - this can be changed if a different pattern is required.
-		processTemplateD(template, thisClass, method, null);
-	}
-
-	@Override
-	protected void processTemplateD(String[] template, AmqpClass thisClass,
-			AmqpMethod method, AmqpField field) throws IOException,
-			AmqpTemplateException, AmqpTypeMappingException,
-			IllegalAccessException, InvocationTargetException
-	{
-		// I've put in the Java model here - this can be changed if a different pattern is required.
-		StringBuffer sb = new StringBuffer(template[1]);
-		String filename = prepareFilename(getTemplateFileName(sb), thisClass, method, field);
-		try { processAllLists(sb, thisClass, method, null); }
-		catch (AmqpTemplateException e)
-		{
-			System.out.println("WARNING: " + template[templateFileNameIndex] + ": " + e.getMessage());
-		}
-		try { processAllTokens(sb, thisClass, method, field, null); }
-		catch (AmqpTemplateException e)
-		{
-			System.out.println("WARNING: " + template[templateFileNameIndex] + ": " + e.getMessage());
-		}
-		writeTargetFile(sb, new File(genDir + Utils.fileSeparator + filename));
-		generatedFileCounter ++;
-	}
-
-	@Override
-	protected String processToken(String token, AmqpClass thisClass,
-			AmqpMethod method, AmqpField field, AmqpVersion version)
-			throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getDomainType(String domainName, AmqpVersion version)
-			throws AmqpTypeMappingException
-	{
-		return globalDomainMap.getDomainType(domainName, version);
-	}
-
-	public String getGeneratedType(String domainName, AmqpVersion version)
-			throws AmqpTypeMappingException
-	{
-		String domainType = globalDomainMap.getDomainType(domainName, version);
-		if (domainType == null)
-        {
-			throw new AmqpTypeMappingException("Domain type \"" + domainName +
-                "\" not found in Java typemap.");
-        }
-        DomainInfo info = typeMap.get(domainType);
-        if (info == null)
-        {
-            throw new AmqpTypeMappingException("Unknown domain: \"" + domainType + "\"");
-        }
-		return info.type;
-	}
-
-	public String prepareClassName(String className)
-	{
-		return camelCaseName(className, true);
-	}
-
-	public String prepareDomainName(String domainName)
-	{
-		return camelCaseName(domainName, false);
-	}
-
-	public String prepareMethodName(String methodName)
-	{
-		return camelCaseName(methodName, false);
-	}
-
-	private String camelCaseName(String name, boolean upperFirstFlag)
-	{
-		StringBuffer ccn = new StringBuffer();
-		String[] toks = name.split("[-_.\\ ]");
-		for (int i=0; i<toks.length; i++)
-		{
-			StringBuffer b = new StringBuffer(toks[i]);
-			if (upperFirstFlag || i>0)
-				b.setCharAt(0, Character.toUpperCase(toks[i].charAt(0)));
-			ccn.append(b);
-		}
-		return ccn.toString();
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/Generator.java b/cpp/gentools/src/org/apache/qpid/gentools/Generator.java
deleted file mode 100644
index e7ccd64fbe..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/Generator.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-public abstract class Generator implements LanguageConverter
-{
-    protected static String cr = Utils.lineSeparator;
-    protected static enum EnumConstOutputTypes { OUTPUT_STRING, OUTPUT_INTEGER, OUTPUT_DOUBLE; };
-    
-	// This string is reproduced in every generated file as a comment
-	// TODO: Tie the version info into the build system.
-	protected static final String generatorInfo = "Qpid Gentools v.0.1";
-	protected static final int templateFileNameIndex = 0;
-	protected static final int templateStringIndex = 1;
-	
-	protected ArrayList<String[]> modelTemplateList;
-	protected ArrayList<String[]> classTemplateList;
-	protected ArrayList<String[]> methodTemplateList;
-	protected ArrayList<String[]> fieldTemplateList;
-	protected String genDir;
-	
-	protected AmqpVersionSet globalVersionSet;
-	protected AmqpDomainMap globalDomainMap;
-    protected AmqpConstantSet globalConstantSet;
-	protected AmqpModel model;
-	
-	protected int generatedFileCounter;
-	
-	public Generator(AmqpVersionSet versionList)
-	{
-		this.globalVersionSet = versionList;
-		modelTemplateList = new ArrayList<String[]>();
-		classTemplateList = new ArrayList<String[]>();
-		methodTemplateList = new ArrayList<String[]>();
-		fieldTemplateList = new ArrayList<String[]>();
-		generatedFileCounter = 0;	
-	}
-	
-	public int getNumberGeneratedFiles()
-	{
-		return generatedFileCounter;
-	}
-	
-	public void setDomainMap(AmqpDomainMap domainMap)
-	{
-		this.globalDomainMap = domainMap;
-	}
-	
-	public AmqpDomainMap getDomainMap()
-	{
-		return globalDomainMap;
-	}
-    
-    public void setConstantSet(AmqpConstantSet constantSet)
-    {
-        this.globalConstantSet = constantSet;
-    }
-    
-    public AmqpConstantSet getConstantSet()
-    {
-        return globalConstantSet;
-    }
-	
-	public void setModel(AmqpModel model)
-	{
-		this.model = model;
-	}
-	
-	public AmqpModel getModel()
-	{
-		return model;
-	}
-	
-	public void initializeTemplates(File[] modelTemplateFiles, File[] classTemplatesFiles,
-		File[] methodTemplatesFiles, File[] fieldTemplatesFiles)
-	    throws FileNotFoundException, IOException
-	{
-		if (modelTemplateFiles.length > 0)
-		{
-			System.out.println("Model template file(s):");
-			for (File mtf : modelTemplateFiles)
-			{
-				System.out.println("  " + mtf.getAbsolutePath());
-				String template[] = {mtf.getName(), loadTemplate(mtf)};
-				modelTemplateList.add(template);
-			}
-		}
-		if (classTemplatesFiles.length > 0)
-		{
-			System.out.println("Class template file(s):");
-			//for (int c=0; c<classTemplatesFiles.length; c++)
-			for (File ctf : classTemplatesFiles)
-			{
-				System.out.println("  " + ctf.getAbsolutePath());
-				String template[] = {ctf.getName(), loadTemplate(ctf)};
-				classTemplateList.add(template);
-			}
-		}
-		if (methodTemplatesFiles.length > 0)
-		{
-			System.out.println("Method template file(s):");
-			for (File mtf : methodTemplatesFiles)
-			{
-				System.out.println("  " + mtf.getAbsolutePath());
-				String template[] = {mtf.getName(), loadTemplate(mtf)};
-				methodTemplateList.add(template);
-			}
-		}
-		if (fieldTemplatesFiles.length > 0)
-		{
-			System.out.println("Field template file(s):");
-			for (File ftf : fieldTemplatesFiles)
-			{
-				System.out.println("  " + ftf.getAbsolutePath());
-				String template[] = {ftf.getName(), loadTemplate(ftf)};
-				fieldTemplateList.add(template);
-			}
-		}
-	}
-
-	abstract protected String prepareFilename(String filenameTemplate, AmqpClass thisClass, AmqpMethod method,
-		AmqpField field);
-
-	abstract protected String processToken(String token, AmqpClass thisClass, AmqpMethod method,
-		AmqpField field, AmqpVersion version)
-	    throws AmqpTemplateException, AmqpTypeMappingException;
-	
-	abstract protected void processClassList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-        AmqpModel model)
-        throws AmqpTemplateException, AmqpTypeMappingException;
-	
-	abstract protected void processMethodList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-        AmqpClass thisClass)
-        throws AmqpTemplateException, AmqpTypeMappingException;
-	
-	abstract protected void processFieldList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-		AmqpFieldMap fieldMap, AmqpVersion version)
-        throws AmqpTypeMappingException, AmqpTemplateException, IllegalAccessException,
-        	InvocationTargetException;
-    
-    abstract protected void processConstantList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-        AmqpConstantSet constantSet)
-        throws AmqpTemplateException, AmqpTypeMappingException;
-	
-	public void generate(File genDir)
-	    throws TargetDirectoryException, IOException, AmqpTypeMappingException,
-	    	AmqpTemplateException, IllegalAccessException, InvocationTargetException
-	{
-		prepareTargetDirectory(genDir, true);
-		System.out.println("Generation directory: " + genDir.getAbsolutePath());
-		this.genDir = genDir.getAbsolutePath();
-
-		// Use all model-level templates
-		for (String[] mt : modelTemplateList)
-		{
-			processTemplateA(mt);
-		}
-		
-		// Cycle through classes
-		for (String className : model.classMap.keySet())
-		{
-			AmqpClass thisClass = model.classMap.get(className);
-			// Use all class-level templates
-			for (String[] ct : classTemplateList)
-			{
-				processTemplateB(ct, thisClass);
-			}
-
-			// Cycle through all methods
-			for (String methodName : thisClass.methodMap.keySet())
-			{
-				AmqpMethod method = thisClass.methodMap.get(methodName);
-				// Use all method-level templates
-				for (String[] mt : methodTemplateList)
-				{
-					processTemplateC(mt, thisClass, method);
-				}
-
-				// Cycle through all fields
-				for (String fieldName : method.fieldMap.keySet())
-				{
-					AmqpField field = method.fieldMap.get(fieldName);
-					// Use all field-level templates
-					for (String[] ft : fieldTemplateList)
-					{
-						processTemplateD(ft, thisClass, method, field);
-					}
-				}
-			}
-		}
-	}
-	
-	protected void processVersionList(StringBuffer sb, int tokStart, int tokEnd)
-	    throws AmqpTypeMappingException
-	{
-		int lend = sb.indexOf(Utils.lineSeparator, tokStart) + 1; // Include cr at end of line
-		String tline = sb.substring(tokEnd, lend); // Line excluding line marker, including cr
-		sb.delete(tokStart, lend);
-		
-		for (AmqpVersion v : globalVersionSet)
-		{
-			// Insert copy of target line
-			StringBuffer isb = new StringBuffer(tline);
-			if (isb.indexOf("${protocol-version-list-entry}") >= 0)
-			{
-				String versionListEntry = "       { ${major}, ${minor} }" +
-				  (v.equals(globalVersionSet.last()) ? "" : ",");
-				replaceToken(isb, "${protocol-version-list-entry}", String.valueOf(versionListEntry));
-			}
-			if (isb.indexOf("${major}") >= 0)
-				replaceToken(isb, "${major}", String.valueOf(v.getMajor()));
-			if (isb.indexOf("${minor}") >= 0)
-				replaceToken(isb, "${minor}", String.valueOf(v.getMinor()));
-			sb.insert(tokStart, isb.toString());
-			tokStart += isb.length();
-		}							
-	}
-
-	// Model-level template processing
-	abstract protected void processTemplateA(String[] template)
-        throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-        	IllegalAccessException, InvocationTargetException;
-	
-	// Class-level template processing
-	abstract protected void processTemplateB(String[] template, AmqpClass thisClass)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	        IllegalAccessException, InvocationTargetException;
-	
-	// Method-level template processing
-	abstract protected void processTemplateC(String[] template, AmqpClass thisClass,
-		AmqpMethod method)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	    	IllegalAccessException, InvocationTargetException;
-	
-	// Field-level template processing
-	abstract protected void processTemplateD(String[] template, AmqpClass thisClass,
-		AmqpMethod method, AmqpField field)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	    	IllegalAccessException, InvocationTargetException;
-	
-	// Helper functions common to all generators
-	
-	protected static void prepareTargetDirectory(File dir, boolean createFlag)
-	    throws TargetDirectoryException
-	{
-		if (dir.exists())
-		{
-			if (!dir.isDirectory())
-				throw new TargetDirectoryException("\"" + dir.getAbsolutePath() +
-						"\" exists, but is not a directory.");
-		}
-		else if (createFlag) // Create dir
-		{
-			if(!dir.mkdirs())
-				throw new TargetDirectoryException("Unable to create directory \"" +
-						dir.getAbsolutePath() + "\".");
-		}
-		else
-			throw new TargetDirectoryException("Directory \"" + dir.getAbsolutePath() +
-					"\" not found.");
-			
-	}
-
-	protected void processAllLists(StringBuffer sb, AmqpClass thisClass, AmqpMethod method, AmqpVersion version)
-	    throws AmqpTemplateException, AmqpTypeMappingException, IllegalAccessException,
-	    	InvocationTargetException
-	{
-		int lstart = sb.indexOf("%{");
-		while (lstart != -1)
-		{
-			int lend = sb.indexOf("}", lstart + 2);
-			if (lend > 0)
-			{
-				String listToken = sb.substring(lstart + 2, lend);
-				if (listToken.compareTo("VLIST") == 0)
-				{
-					processVersionList(sb, lstart, lend + 1);
-				}
-				else if (listToken.compareTo("CLIST") == 0)
-				{
-					processClassList(sb, lstart, lend + 1, model);
-				}
-				else if (listToken.compareTo("MLIST") == 0)
-				{
-					processMethodList(sb, lstart, lend + 1, thisClass);
-				}
-				else if (listToken.compareTo("FLIST") == 0)
-				{
-					// Pass the FieldMap from either a class or a method.
-					// If this is called from a class-level template, we assume that the
-					// class field list is required. In this case, method will be null.
-					processFieldList(sb, lstart, lend + 1,
-						(method == null ? thisClass.fieldMap : method.fieldMap),
-						version);
-				}
-                else if (listToken.compareTo("TLIST") == 0)
-                {
-                    processConstantList(sb, lstart, lend + 1, globalConstantSet);
-                }
-				else
-				{
-					throw new AmqpTemplateException("Unknown list token \"%{" + listToken +
-						"}\" found in template at index " + lstart + ".");
-				}
-			}
-			lstart = sb.indexOf("%{", lstart + 1);
-		}		
-	}
-	
-	protected void processAllTokens(StringBuffer sb, AmqpClass thisClass, AmqpMethod method, AmqpField field,
-		AmqpVersion version)
-        throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		int lstart = sb.indexOf("${");
-		while (lstart != -1)
-		{
-			int lend = sb.indexOf("}", lstart + 2);
-			if (lend > 0)
-			{
-				String token = sb.substring(lstart, lend + 1);
-				replaceToken(sb, lstart, token, processToken(token, thisClass, method, field, version));
-			}
-			lstart = sb.indexOf("${", lstart);
-		}			
-	}
-	
-	protected static void writeTargetFile(StringBuffer sb, File f)
-	    throws IOException
-	{
-		FileWriter fw = new FileWriter(f);
-		fw.write(sb.toString().toCharArray());
-		fw.flush();
-		fw.close();
-	}
-	
-	protected static String getTemplateFileName(StringBuffer sb)
-	    throws AmqpTemplateException
-	{
-		if (sb.charAt(0) != '&')
-			throw new AmqpTemplateException("No filename marker &{filename} found at start of template.");
-		int cr = sb.indexOf(Utils.lineSeparator);
-		if (cr < 0)
-			throw new AmqpTemplateException("Bad template structure - unable to find first line.");
-		String fileName = sb.substring(2, cr-1);
-		sb.delete(0, cr + 1);
-		return fileName;
-	}
-
-	protected static void replaceToken(StringBuffer sb, String token, String replacement)
-	{
-		replaceToken(sb, 0, token, replacement);
-	}
-
-	protected static void replaceToken(StringBuffer sb, int index, String token, String replacement)
-	{
-		if (replacement != null)
-		{
-			int start = sb.indexOf(token, index);
-			int len = token.length();
-			// Find first letter in token and determine if it is capitalized
-			char firstTokenLetter = getFirstLetter(token);
-			if (firstTokenLetter != 0 && Character.isUpperCase(firstTokenLetter))
-				sb.replace(start, start+len, Utils.firstUpper(replacement));
-			else
-				sb.replace(start, start+len, replacement);
-		}
-	}
-	
-	private static char getFirstLetter(String str)
-	{
-		int len = str.length();
-		int index = 0;
-		char tokChar = str.charAt(index);
-		while (!Character.isLetter(tokChar) && index<len-1)
-			tokChar = str.charAt(++index);
-		if (Character.isLetter(tokChar))
-			return tokChar;
-		return 0;
-	}
-	
-	private static String loadTemplate(File f)
-	    throws FileNotFoundException, IOException
-	{
-		StringBuffer sb = new StringBuffer();
-		FileReader fr = new FileReader(f);
-		LineNumberReader lnr = new LineNumberReader(fr);
-		String line = lnr.readLine();
-		while (line != null)
-		{
-			// Strip lines starting with '#' in template - treat these lines as template comments
-//			if (line.length() > 0 && line.charAt(0) != '#') // Bad idea - '#' used in C/C++ files (#include)!
-			if (line.length() > 0)
-				sb.append(line + Utils.lineSeparator);
-			else
-				sb.append(Utils.lineSeparator);
-			line = lnr.readLine();
-		}
-		lnr.close();
-		fr.close();
-		return sb.toString();
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/cpp/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
deleted file mode 100644
index 9acfaf65fa..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ /dev/null
@@ -1,1702 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.TreeMap;
-
-public class JavaGenerator extends Generator
-{
-	// TODO: Move this to parent class
-	protected static final int FIELD_NAME = 0;
-	protected static final int FIELD_CODE_TYPE = 1;
-	
-	private class DomainInfo
-	{
-		public String type;
-		public String size;
-		public String encodeExpression;
-		public String decodeExpression;
-		public DomainInfo(String domain, String size, String encodeExpression, String decodeExpression)
-		{
-			this.type = domain;
-			this.size = size;
-			this.encodeExpression = encodeExpression;
-			this.decodeExpression = decodeExpression;
-		}
-	}
-	
-	private static TreeMap<String, DomainInfo> typeMap = new TreeMap<String, DomainInfo>();
-
-	// Methods used for generation of code snippets called from the field map parsers
-	
-	// Common methods
-	static private Method declarationGenerateMethod;
-	static private Method mangledDeclarationGenerateMethod;
-	
-	// Methods for MessageBody classes
-	static private Method mbGetGenerateMethod;
-	static private Method mbMangledGetGenerateMethod;
-	static private Method mbParamListGenerateMethod;
-	static private Method mbPassedParamListGenerateMethod;
-	static private Method mbMangledParamListGenerateMethod;
-	static private Method mbMangledPassedParamListGenerateMethod;
-	static private Method mbBodyInitGenerateMethod;
-	static private Method mbMangledBodyInitGenerateMethod;
-	static private Method mbSizeGenerateMethod;
-	static private Method mbBitSizeGenerateMethod;
-	static private Method mbEncodeGenerateMethod;
-	static private Method mbBitEncodeGenerateMethod;
-	static private Method mbDecodeGenerateMethod;
-	static private Method mbBitDecodeGenerateMethod;
-	static private Method mbToStringGenerateMethod;
-	static private Method mbBitToStringGenerateMethod;
-	
-	// Methods for PropertyContentHeader classes
-	static private Method pchClearGenerateMethod;
-	static private Method pchMangledClearGenerateMethod;
-	static private Method pchGetGenerateMethod;
-	static private Method pchMangledGetGenerateMethod;
-	static private Method pchSetGenerateMethod;
-	static private Method pchMangledSetGenerateMethod;
-	static private Method pchSizeGenerateMethod;
-	static private Method pchBitSizeGenerateMethod;
-	static private Method pchEncodeGenerateMethod;
-	static private Method pchBitEncodeGenerateMethod;
-	static private Method pchDecodeGenerateMethod;
-	static private Method pchBitDecodeGenerateMethod;
-	static private Method pchGetPropertyFlagsGenerateMethod;
-	static private Method pchBitGetPropertyFlagsGenerateMethod;
-	static private Method pchSetPropertyFlagsGenerateMethod;
-	static private Method pchBitSetPropertyFlagsGenerateMethod;
-	
-	static 
-	{
-		// **************
-		// Common methods
-		// **************
-		
-		// Methods for AmqpFieldMap.parseFieldMap()
-		
-		try { declarationGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-		    "generateFieldDeclaration", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mangledDeclarationGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMangledFieldDeclaration", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		
-		// *******************************
-		// Methods for MessageBody classes
-		// *******************************
-		
-		// Methods for AmqpFieldMap.parseFieldMap()
-		
-		try { mbGetGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-		    "generateMbGetMethod", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbMangledGetGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbMangledGetMethod", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-
-		try { mbParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbParamList", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		
-		try { mbPassedParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbPassedParamList", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbMangledParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbMangledParamList", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbMangledPassedParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbMangledPassedParamList", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbBodyInitGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbBodyInit", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbMangledBodyInitGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbMangledBodyInit", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		// Methods for AmqpFieldMap.parseFieldMapOrdinally()
-		
-		try { mbSizeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbFieldSize", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbBitSizeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbBitArrayFieldSize", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbEncodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbFieldEncode", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbBitEncodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbBitFieldEncode", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbDecodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbFieldDecode", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbBitDecodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbBitFieldDecode", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbToStringGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbFieldToString", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { mbBitToStringGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generateMbBitFieldToString", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		// *****************************************
-		// Methods for PropertyContentHeader classes
-		// *****************************************
-		
-		// Methods for AmqpFieldMap.parseFieldMap()
-
-		try { pchClearGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-		    "generatePchClearMethod", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchMangledClearGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchMangledClearMethod", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-
-		try { pchSetGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-		    "generatePchSetMethod", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchMangledSetGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchMangledSetMethod", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-
-		try { pchGetGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-		    "generatePchGetMethod", String.class, AmqpField.class,
-			AmqpVersionSet.class, int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchMangledGetGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchMangledGetMethod", AmqpField.class,
-			int.class, int.class, boolean.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		// Methods for AmqpFieldMap.parseFieldMapOrdinally()
-			
-		try { pchSizeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchFieldSize", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchBitSizeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchBitArrayFieldSize", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchEncodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchFieldEncode", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchBitEncodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchBitFieldEncode", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchDecodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchFieldDecode", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchBitDecodeGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchBitFieldDecode", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchGetPropertyFlagsGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchGetPropertyFlags", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchBitGetPropertyFlagsGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchBitGetPropertyFlags", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchSetPropertyFlagsGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchSetPropertyFlags", String.class, String.class,
-			int.class, int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-		
-		try { pchBitSetPropertyFlagsGenerateMethod = JavaGenerator.class.getDeclaredMethod(
-			"generatePchBitSetPropertyFlags", ArrayList.class, int.class,
-			int.class, int.class); }
-		catch (NoSuchMethodException e) { e.printStackTrace(); }
-	}
-	
-	public JavaGenerator(AmqpVersionSet versionList)
-	{
-		super(versionList);
-		// Load Java type and size maps.
-		// Adjust or add to these lists as new types are added/defined.
-		// The char '#' will be replaced by the field variable name (any type).
-		// The char '~' will be replaced by the compacted bit array size (type bit only).
-		typeMap.put("bit", new DomainInfo(
-			"boolean",										// Java code type
-			"~",											// size
-			"EncodingUtils.writeBooleans(buffer, #)",		// encode expression
-			"# = EncodingUtils.readBooleans(buffer)"));		// decode expression
-		typeMap.put("content", new DomainInfo(
-			"Content",										// Java code type
-			"EncodingUtils.encodedContentLength(#)", 	// size
-			"EncodingUtils.writeContentBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readContent(buffer)"));	// decode expression
-		typeMap.put("long", new DomainInfo(
-			"long",											// Java code type
-			"4",											// size
-			"EncodingUtils.writeUnsignedInteger(buffer, #)", // encode expression
-			"# = buffer.getUnsignedInt()")); 				// decode expression
-		typeMap.put("longlong", new DomainInfo(
-			"long",											// Java code type
-			"8",											// size
-			"buffer.putLong(#)", 							// encode expression
-			"# = buffer.getLong()")); 						// decode expression
-		typeMap.put("longstr", new DomainInfo(
-			"byte[]",										// Java code type
-			"EncodingUtils.encodedLongstrLength(#)", 		// size
-			"EncodingUtils.writeLongStringBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readLongstr(buffer)"));		// decode expression
-		typeMap.put("octet", new DomainInfo(
-			"short",										// Java code type
-			"1",											// size
-			"EncodingUtils.writeUnsignedByte(buffer, #)",	// encode expression
-			"# = buffer.getUnsigned()")); 					// decode expression
-		typeMap.put("short", new DomainInfo(
-			"int",											// Java code type
-			"2",											// size
-			"EncodingUtils.writeUnsignedShort(buffer, #)",	// encode expression
-			"# = buffer.getUnsignedShort()")); 				// decode expression
-		typeMap.put("shortstr", new DomainInfo(
-			"AMQShortString",										// Java code type
-			"EncodingUtils.encodedShortStringLength(#)",	// size
-			"EncodingUtils.writeShortStringBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readAMQShortString(buffer)"));	// decode expression
-		typeMap.put("table", new DomainInfo(
-			"FieldTable",									// Java code type
-			"EncodingUtils.encodedFieldTableLength(#)", 	// size
-			"EncodingUtils.writeFieldTableBytes(buffer, #)", // encode expression
-			"# = EncodingUtils.readFieldTable(buffer)"));	// decode expression
-		typeMap.put("timestamp", new DomainInfo(
-			"long",											// Java code type
-			"8",											// size
-			"EncodingUtils.writeTimestamp(buffer, #)",		// encode expression
-			"# = EncodingUtils.readTimestamp(buffer)"));	// decode expression
-	}
-	
-	// === Start of methods for Interface LanguageConverter ===
-	
-	public String prepareClassName(String className)
-	{
-		return camelCaseName(className, true);
-	}
-	
-	public String prepareMethodName(String methodName)
-	{
-		return camelCaseName(methodName, false);		
-	}
-	
-	public String prepareDomainName(String domainName)
-	{
-		return camelCaseName(domainName, false);		
-	}
-	
-	public String getDomainType(String domainName, AmqpVersion version)
-		throws AmqpTypeMappingException
-	{
-		return globalDomainMap.getDomainType(domainName, version);
-	}
-	
-	public String getGeneratedType(String domainName, AmqpVersion version)
-		throws AmqpTypeMappingException
-	{
-		String domainType = globalDomainMap.getDomainType(domainName, version);
-		if (domainType == null)
-        {
-			throw new AmqpTypeMappingException("Domain type \"" + domainName +
-                "\" not found in Java typemap.");
-        }
-        DomainInfo info = typeMap.get(domainType);
-        if (info == null)
-        {
-            throw new AmqpTypeMappingException("Unknown domain: \"" + domainType + "\"");
-        }
-		return info.type;
-	}
-
-	
-	// === Abstract methods from class Generator - Java-specific implementations ===
-	
-	@Override
-	protected String prepareFilename(String filenameTemplate, AmqpClass thisClass, AmqpMethod method,
-			AmqpField field)
-	{
-		StringBuffer sb = new StringBuffer(filenameTemplate);
-		if (thisClass != null)
-			replaceToken(sb, "${CLASS}", thisClass.name);
-		if (method != null)
-			replaceToken(sb, "${METHOD}", method.name);
-		if (field != null)
-			replaceToken(sb, "${FIELD}", field.name);
-		return sb.toString();
-	}
-	
-	@Override
-	protected void processTemplateA(String[] template)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	    	IllegalAccessException, InvocationTargetException
-   	{
-		processTemplateD(template, null, null, null);
-  	}
-	
-	@Override
-	protected void processTemplateB(String[] template, AmqpClass thisClass)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	    	IllegalAccessException, InvocationTargetException
-	{
-		processTemplateD(template, thisClass, null, null);
-	}
-	
-	@Override
-	protected void processTemplateC(String[] template, AmqpClass thisClass,
-		AmqpMethod method)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	    	IllegalAccessException, InvocationTargetException
-	{
-		processTemplateD(template, thisClass, method, null);
-	}
-	
-	@Override
-	protected void processTemplateD(String[] template, AmqpClass thisClass,
-		AmqpMethod method, AmqpField field)
-	    throws IOException, AmqpTemplateException, AmqpTypeMappingException,
-	    	IllegalAccessException, InvocationTargetException
-	{
-		StringBuffer sb = new StringBuffer(template[1]);
-		String filename = prepareFilename(getTemplateFileName(sb), thisClass, method, field);
-		processTemplate(sb, thisClass, method, field, template[templateFileNameIndex], null);
-		writeTargetFile(sb, new File(genDir + Utils.fileSeparator + filename));
-		generatedFileCounter ++;
-	}
-	
-	protected void processTemplate(StringBuffer sb, AmqpClass thisClass, AmqpMethod method,
-		AmqpField field, String templateFileName, AmqpVersion version)
-		throws InvocationTargetException, IllegalAccessException, AmqpTypeMappingException
-	{
-		try { processAllLists(sb, thisClass, method, version); }
-		catch (AmqpTemplateException e)
-		{
-			System.out.println("WARNING: " + templateFileName + ": " + e.getMessage());
-		}
-		try { processAllTokens(sb, thisClass, method, field, version); }
-		catch (AmqpTemplateException e)
-		{
-			System.out.println("WARNING: " + templateFileName + ": " + e.getMessage());
-		}
-	}
-
-	@Override
-	protected String processToken(String token, AmqpClass thisClass, AmqpMethod method, AmqpField field,
-		AmqpVersion version)
-	    throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		if (token.compareTo("${GENERATOR}") == 0)
-			return generatorInfo;
-		if (token.compareTo("${CLASS}") == 0 && thisClass != null)
-			return thisClass.name;
-		if (token.compareTo("${CLASS_ID_INIT}") == 0 && thisClass != null)
-			return generateIndexInitializer("registerClassId", thisClass.indexMap, 8);
-		if (token.compareTo("${METHOD}") == 0 && method != null)
-			return method.name;
-		if (token.compareTo("${METHOD_ID_INIT}") == 0 && method != null)
-			return generateIndexInitializer("registerMethodId", method.indexMap, 8);
-		if (token.compareTo("${FIELD}") == 0 && field != null)
-			return field.name;
-		
-		// This token is used only with class or method-level templates
-		if (token.compareTo("${pch_property_flags_declare}") == 0)
-		{
-			return generatePchPropertyFlagsDeclare();
-		}
-		else if (token.compareTo("${pch_property_flags_initializer}") == 0)
-		{
-			int mapSize = method == null ? thisClass.fieldMap.size() : method.fieldMap.size();
-			return generatePchPropertyFlagsInitializer(mapSize);
-		}
-		else if (token.compareTo("${pch_compact_property_flags_initializer}") == 0)
-		{
-			return generatePchCompactPropertyFlagsInitializer(thisClass, 8, 4);
-		}
-		else if (token.compareTo("${pch_compact_property_flags_check}") == 0)
-		{
-			return generatePchCompactPropertyFlagsCheck(thisClass, 8, 4);
-		}
-		
-		// Oops!
-		throw new AmqpTemplateException("Template token " + token + " unknown.");	
-	}
-	
-	@Override
-	protected void processClassList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-        AmqpModel model)
-	    throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		String codeSnippet;
-		int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-		String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-		int tokStart = tline.indexOf('$');
-		String token = tline.substring(tokStart).trim();
-		sb.delete(listMarkerStartIndex, lend);
-		
-		if (token.compareTo("${reg_map_put_method}") == 0)
-		{
-			codeSnippet = generateRegistry(model, 8, 4); 
-		}
-		
-		else // Oops!
-		{
-			throw new AmqpTemplateException("Template token " + token + " unknown.");
-		}
-
-		sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-	
-	@Override
-	protected void processMethodList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-        AmqpClass thisClass)
-        throws AmqpTemplateException, AmqpTypeMappingException
-	{
-		String codeSnippet;
-		int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-		String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-		int tokStart = tline.indexOf('$');
-		String token = tline.substring(tokStart).trim();
-		sb.delete(listMarkerStartIndex, lend);
-		
-		//TODO - we don't have any cases of this (yet).
-		if (token.compareTo("${???}") == 0)
-		{
-			codeSnippet = token; 
-		}
-		else // Oops!
-		{
-			throw new AmqpTemplateException("Template token " + token + " unknown.");
-		}
-		
-		sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-	
-	@Override
-	protected void processFieldList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-		AmqpFieldMap fieldMap, AmqpVersion version)
-	    throws AmqpTypeMappingException, AmqpTemplateException, IllegalAccessException,
-	    	InvocationTargetException
-	{
-		String codeSnippet;
-		int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-		String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-		int tokStart = tline.indexOf('$');
-		String token = tline.substring(tokStart).trim();
-		sb.delete(listMarkerStartIndex, lend);
-		
-		// Field declarations - common to MethodBody and PropertyContentHeader classes
-		if (token.compareTo("${field_declaration}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMap(declarationGenerateMethod,
-				mangledDeclarationGenerateMethod, 4, 4, this);
-		}
-		
-		// MethodBody classes
-		else if (token.compareTo("${mb_field_get_method}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMap(mbGetGenerateMethod,
-				mbMangledGetGenerateMethod, 4, 4, this);
-		}
-		else if (token.compareTo("${mb_field_parameter_list}") == 0)
-		{
-			// <cringe> The code generated by this is ugly... It puts a comma on a line by itself!
-			// TODO: Find a more elegant solution here sometime...
-			codeSnippet = fieldMap.size() > 0 ? Utils.createSpaces(42) + "," + cr : "";
-			// </cringe>
-			codeSnippet += fieldMap.parseFieldMap(mbParamListGenerateMethod,
-				mbMangledParamListGenerateMethod, 42, 4, this);
-		}
-
-		else if (token.compareTo("${mb_field_passed_parameter_list}") == 0)
-		{
-			// <cringe> The code generated by this is ugly... It puts a comma on a line by itself!
-			// TODO: Find a more elegant solution here sometime...
-			codeSnippet = fieldMap.size() > 0 ? Utils.createSpaces(42) + "," + cr : "";
-			// </cringe>
-			codeSnippet += fieldMap.parseFieldMap(mbPassedParamListGenerateMethod,
-				mbMangledPassedParamListGenerateMethod, 42, 4, this);
-		}
-		else if (token.compareTo("${mb_field_body_initialize}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMap(mbBodyInitGenerateMethod,
-				mbMangledBodyInitGenerateMethod, 8, 4, this);
-		}
-		else if (token.compareTo("${mb_field_size}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(mbSizeGenerateMethod,
-				mbBitSizeGenerateMethod, 8, 4, this);
-		}
-		else if (token.compareTo("${mb_field_encode}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(mbEncodeGenerateMethod,
-				mbBitEncodeGenerateMethod, 8, 4, this);
-		}
-		else if (token.compareTo("${mb_field_decode}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(mbDecodeGenerateMethod,
-				mbBitDecodeGenerateMethod, 8, 4, this);
-		}
-		else if (token.compareTo("${mb_field_to_string}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(mbToStringGenerateMethod,
-				mbBitToStringGenerateMethod, 8, 4, this);
-		}
-		
-		// PropertyContentHeader classes
-		else if (token.compareTo("${pch_field_list_size}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(pchSizeGenerateMethod,
-				pchBitSizeGenerateMethod, 12, 4, this);
-		}
-		else if (token.compareTo("${pch_field_list_payload}") == 0 )
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(pchEncodeGenerateMethod,
-				pchBitEncodeGenerateMethod, 12, 4, this);
-		}
-		else if (token.compareTo("${pch_field_list_decode}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(pchDecodeGenerateMethod,
-				pchBitDecodeGenerateMethod, 12, 4, this);
-		}
-		else if (token.compareTo("${pch_get_compact_property_flags}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(pchGetPropertyFlagsGenerateMethod,
-				pchBitGetPropertyFlagsGenerateMethod, 8, 4, this);
-		}
-		else if (token.compareTo("${pch_set_compact_property_flags}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMapOrdinally(pchSetPropertyFlagsGenerateMethod,
-				pchBitSetPropertyFlagsGenerateMethod, 8, 4, this);
-		}
-		else if (token.compareTo("${pch_field_clear_methods}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMap(pchClearGenerateMethod,
-					pchMangledClearGenerateMethod, 4, 4, this);
-		}
-		else if (token.compareTo("${pch_field_get_methods}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMap(pchGetGenerateMethod,
-					pchMangledGetGenerateMethod, 4, 4, this);
-		}
-		else if (token.compareTo("${pch_field_set_methods}") == 0)
-		{
-			codeSnippet = fieldMap.parseFieldMap(pchSetGenerateMethod,
-					pchMangledSetGenerateMethod, 4, 4, this);
-		}
-		
-		else // Oops!
-		{
-			throw new AmqpTemplateException("Template token " + token + " unknown.");
-		}
-		sb.insert(listMarkerStartIndex, codeSnippet);
-	}
-
-    @Override
-    protected void processConstantList(StringBuffer sb, int listMarkerStartIndex, int listMarkerEndIndex,
-        AmqpConstantSet constantSet)
-        throws AmqpTemplateException, AmqpTypeMappingException
-
-        {
-        String codeSnippet;
-        int lend = sb.indexOf(cr, listMarkerStartIndex) + 1; // Include cr at end of line
-        String tline = sb.substring(listMarkerEndIndex, lend); // Line excluding line marker, including cr
-        int tokStart = tline.indexOf('$');
-        String token = tline.substring(tokStart).trim();
-        sb.delete(listMarkerStartIndex, lend);
-
-        if (token.compareTo("${const_get_method}") == 0)
-        {
-            codeSnippet = generateConstantGetMethods(constantSet, 4, 4); 
-        }
-       
-        else // Oops!
-        {
-            throw new AmqpTemplateException("Template token " + token + " unknown.");
-        }
-
-        sb.insert(listMarkerStartIndex, codeSnippet);
-        }
-    
-    
-	// === Protected and private helper functions unique to Java implementation ===
-	
-	// Methods used for generation of code snippets called from the field map parsers
-	
-	// Common methods
-
-	protected String generateFieldDeclaration(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-	{
-		return Utils.createSpaces(indentSize) + "public " + codeType + " " + field.name +
-			"; // AMQP version(s): " + versionSet + cr;
-	}
-
-	protected String generateMangledFieldDeclaration(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-	    throws AmqpTypeMappingException
-	{
-		StringBuffer sb = new StringBuffer();
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			String domainName = dItr.next();
-			AmqpVersionSet versionSet = field.domainMap.get(domainName);
-			String codeType = getGeneratedType(domainName, versionSet.first());
-			sb.append(Utils.createSpaces(indentSize) + "public " + codeType + " " +
-				field.name + "_" + (domainCntr++) + "; // AMQP Version(s): " + versionSet +
-				cr);
-		}
-		return sb.toString();		
-	}
-
-	protected String generateIndexInitializer(String mapName, AmqpOrdinalVersionMap indexMap, int indentSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer();
-		
-        for (Integer index : indexMap.keySet())
-		{
-			AmqpVersionSet versionSet = indexMap.get(index);
-            for (AmqpVersion version : versionSet)
-			{
-				sb.append(indent + mapName + "( (byte) " + version.getMajor() +", (byte) " + version.getMinor() + ", " + index + ");" + cr);
-			}
-		}
-		return sb.toString();		
-	}
-
-	protected String generateRegistry(AmqpModel model, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		
-		for (String className : model.classMap.keySet())
-		{
-			AmqpClass thisClass = model.classMap.get(className);
-			for (String methodName : thisClass.methodMap.keySet())
-			{
-				AmqpMethod method = thisClass.methodMap.get(methodName);
-				for (AmqpVersion version : globalVersionSet)
-				{
-					// Find class and method index for this version (if it exists)
-					try
-					{
-						int classIndex = findIndex(thisClass.indexMap, version);
-						int methodIndex = findIndex(method.indexMap, version);
-						sb.append(indent + "registerMethod(" + cr);
-						sb.append(indent + tab + "(short)" + classIndex +
-							", (short)" + methodIndex + ", (byte)" + version.getMajor() +
-							", (byte)" + version.getMinor() + ", " + cr);
-						sb.append(indent + tab + Utils.firstUpper(thisClass.name) +
-							Utils.firstUpper(method.name) + "Body.getFactory());" + cr);
-					}
-					catch (Exception e) {} // Ignore
-				}
-			}
-		}
-		return sb.toString();
-	}
-	
-	protected int findIndex(TreeMap<Integer, AmqpVersionSet> map, AmqpVersion version)
-	    throws Exception
-	{
-		Iterator<Integer> iItr = map.keySet().iterator();
-		while (iItr.hasNext())
-		{
-			int index = iItr.next();
-			AmqpVersionSet versionSet = map.get(index);
-			if (versionSet.contains(version))
-				return index;
-		}
-		throw new Exception("Index not found");
-	}
-    
-    // Methods for AmqpConstants class
-   
-    protected String generateConstantGetMethods(AmqpConstantSet constantSet,
-        int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        StringBuffer sb = new StringBuffer();
-        Iterator<AmqpConstant> cItr = constantSet.iterator();
-        while (cItr.hasNext())
-        {
-            AmqpConstant constant = cItr.next();
-            if (constant.isVersionConsistent(globalVersionSet))
-            {
-                // return a constant
-                String value = constant.firstKey();
-                sb.append(indent + "public static String " + constant.name + "() { return \"" +
-                    constant.firstKey() + "\"; }" + cr);
-                if (Utils.containsOnlyDigits(value))
-                {
-                    sb.append(indent + "public static int " + constant.name + "AsInt() { return " +
-                        constant.firstKey() + "; }" + cr);
-                }
-                if (Utils.containsOnlyDigitsAndDecimal(value))
-                {
-                    sb.append(indent + "public static double " + constant.name + "AsDouble() { return (double)" +
-                        constant.firstKey() + "; }" + cr);
-                }
-                sb.append(cr);
-            }
-            else
-            {
-                // Return version-specific constant
-                sb.append(generateVersionDependentGet(constant, "String", "", "\"", "\"", indentSize, tabSize));
-                sb.append(generateVersionDependentGet(constant, "int", "AsInt", "", "", indentSize, tabSize));
-                sb.append(generateVersionDependentGet(constant, "double", "AsDouble", "(double)", "", indentSize, tabSize));
-                sb.append(cr);
-           }
-        }        
-        return sb.toString();       
-    }
-    
-    protected String generateVersionDependentGet(AmqpConstant constant,
-        String methodReturnType, String methodNameSuffix, String returnPrefix, String returnPostfix,
-        int indentSize, int tabSize)
-        throws AmqpTypeMappingException
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        sb.append(indent + "public static " + methodReturnType + " " + constant.name +
-            methodNameSuffix + "(byte major, byte minor) throws AMQProtocolVersionException" + cr);
-        sb.append(indent + "{" + cr);
-        boolean first = true;
-        Iterator<String> sItr = constant.keySet().iterator();
-        while (sItr.hasNext())
-        {
-            String value = sItr.next();
-            AmqpVersionSet versionSet = constant.get(value);
-            sb.append(indent + tab + (first ? "" : "else ") + "if (" + generateVersionCheck(versionSet) +
-                ")" + cr);
-            sb.append(indent + tab + "{" + cr);
-            if (methodReturnType.compareTo("int") == 0 && !Utils.containsOnlyDigits(value))
-            {
-                sb.append(generateConstantDeclarationException(constant.name, methodReturnType,
-                    indentSize + (2*tabSize), tabSize));
-            }
-            else if (methodReturnType.compareTo("double") == 0 && !Utils.containsOnlyDigitsAndDecimal(value))
-            {
-                sb.append(generateConstantDeclarationException(constant.name, methodReturnType,
-                    indentSize + (2*tabSize), tabSize));                            
-            }
-            else
-            {
-                sb.append(indent + tab + tab + "return " + returnPrefix + value + returnPostfix + ";" + cr);
-            }
-            sb.append(indent + tab + "}" + cr);
-            first = false;
-        }
-        sb.append(indent + tab + "else" + cr);
-        sb.append(indent + tab + "{" + cr);
-        sb.append(indent + tab + tab + "throw new AMQProtocolVersionException(\"Constant \\\"" +
-            constant.name + "\\\" \" +" + cr);
-        sb.append(indent + tab + tab + tab +
-            "\"is undefined for AMQP version \" + major + \"-\" + minor + \".\");" + cr);
-        sb.append(indent + tab + "}" + cr);
-        sb.append(indent + "}" + cr); 
-        return sb.toString();       
-    }
-        
-    protected String generateConstantDeclarationException(String name, String methodReturnType,
-        int indentSize, int tabSize)
-    {
-        String indent = Utils.createSpaces(indentSize);
-        String tab = Utils.createSpaces(tabSize);
-        StringBuffer sb = new StringBuffer();
-        sb.append(indent + "throw new AMQProtocolVersionException(\"Constant \\\"" +
-            name + "\\\" \" +" + cr);
-        sb.append(indent + tab + "\"cannot be converted to type " + methodReturnType +
-            " for AMQP version \" + major + \"-\" + minor + \".\");" + cr);        
-        return sb.toString();       
-    }
-    
-	// Methods for MessageBody classes
-	protected String generateMbGetMethod(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-	{
-		return Utils.createSpaces(indentSize) + "public " + codeType + " get" +
-			Utils.firstUpper(field.name) + "() { return " + field.name + "; }" +
-			cr;
-	}
-	
-	protected String generateMbMangledGetMethod(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer(cr);
-		sb.append(indent + "public <T> T get" + Utils.firstUpper(field.name) +
-				"(Class<T> classObj) throws AMQProtocolVersionException" + cr);
-		sb.append(indent + "{" + cr);		
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			String domainName = dItr.next();
-			AmqpVersionSet versionSet = field.domainMap.get(domainName);
-			String codeType = getGeneratedType(domainName, versionSet.first());
-			sb.append(indent + tab + "if (classObj.equals(" + codeType +
-				".class)) // AMQP Version(s): " + versionSet + cr);
-			sb.append(indent + tab + tab + "return (T)(Object)" + field.name + "_" +
-				(domainCntr++) + ";" + cr);
-		}
-		sb.append(indent + tab +
-		"throw new AMQProtocolVersionException(\"None of the AMQP versions defines \" +" +
-		cr + "            \"field \\\"" + field.name +
-		"\\\" as domain \\\"\" + classObj.getName() + \"\\\".\");" + cr);
-		sb.append(indent + "}" + cr);		
-		sb.append(cr);		
-		return sb.toString();		
-	}
-	
-	protected String generateMbParamList(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-	{
-		return Utils.createSpaces(indentSize) + codeType + " " + field.name +
-			(nextFlag ? "," : "") + " // AMQP version(s): " + versionSet + cr;
-	}
-	
-	
-	protected String generateMbPassedParamList(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-	{
-		return Utils.createSpaces(indentSize) + field.name +
-			(nextFlag ? "," : "") + " // AMQP version(s): " + versionSet + cr;
-	}
-	
-	
-	protected String generateMbMangledParamList(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		StringBuffer sb = new StringBuffer();
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			String domainName = dItr.next();
-			AmqpVersionSet versionSet = field.domainMap.get(domainName);
-			String codeType = getGeneratedType(domainName, versionSet.first());
-			sb.append(Utils.createSpaces(indentSize) + codeType + " " + field.name + "_" +
-				(domainCntr++) + (nextFlag ? "," : "") + " // AMQP version(s): " +
-				versionSet + cr);
-		}
-		return sb.toString();		
-	}
-	
-	protected String generateMbMangledPassedParamList(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		StringBuffer sb = new StringBuffer();
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			String domainName = dItr.next();
-			AmqpVersionSet versionSet = field.domainMap.get(domainName);
-			sb.append(Utils.createSpaces(indentSize) + field.name + "_" +
-				(domainCntr++) + (nextFlag ? "," : "") + " // AMQP version(s): " +
-				versionSet + cr);
-		}
-		return sb.toString();		
-	}
-	
-	
-	protected String generateMbBodyInit(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-	{
-		return Utils.createSpaces(indentSize) + "this." + field.name + " = " + field.name +
-			";" + cr;
-	}
-	
-	protected String generateMbMangledBodyInit(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		StringBuffer sb = new StringBuffer();
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			dItr.next();
-			sb.append(Utils.createSpaces(indentSize) + "bodyFrame." + field.name + "_" + domainCntr +
-					" = " + field.name + "_" + (domainCntr++) +	";" + cr);
-		}
-		return sb.toString();		
-	}
-
-	protected String generateMbFieldSize(String domainType, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		StringBuffer sb = new StringBuffer();
-		sb.append(Utils.createSpaces(indentSize) + "size += " +
-			typeMap.get(domainType).size.replaceAll("#", fieldName) +
-			"; // " + fieldName + ": " + domainType + cr);
-		return sb.toString();
-	}
-	
-	protected String generateMbBitArrayFieldSize(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		StringBuffer sb = new StringBuffer();
-		int numBytes = ((bitFieldList.size() - 1) / 8) + 1;
-		String comment = bitFieldList.size() == 1 ?
-			bitFieldList.get(0) + ": bit" :
-			"Combinded bits: " + bitFieldList;
-		sb.append(Utils.createSpaces(indentSize) + "size += " +
-			typeMap.get("bit").size.replaceAll("~", String.valueOf(numBytes)) +
-			"; // " + comment + cr);
-		return sb.toString();
-	}
-
-	protected String generateMbFieldEncode(String domain, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		StringBuffer sb = new StringBuffer();
-		sb.append(Utils.createSpaces(indentSize) +
-			typeMap.get(domain).encodeExpression.replaceAll("#", fieldName) +
-			"; // " + fieldName + ": " + domain + cr);
-		return sb.toString();
-	}
-
-	protected String generateMbBitFieldEncode(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-	
-		StringBuilder sb = new StringBuilder();
-		int i = 0;
-		while(i <bitFieldList.size())
-		{
-		
-			StringBuilder line = new StringBuilder();
-			
-			for (int j=0; i<bitFieldList.size() && j<8; i++, j++)
-			{
-				if (j != 0)
-				{				
-					line.append(", ");
-				}
-				line.append(bitFieldList.get(i));
-			}
-			
-			sb.append(indent +
-				typeMap.get("bit").encodeExpression.replaceAll("#", line.toString()) + ";" + cr);
-		}
-		return sb.toString();
-	}
-
-	protected String generateMbFieldDecode(String domain, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		StringBuffer sb = new StringBuffer();
-		sb.append(Utils.createSpaces(indentSize) +
-			typeMap.get(domain).decodeExpression.replaceAll("#", fieldName) +
-			"; // " + fieldName + ": " + domain + cr);
-		return sb.toString();
-	}
-
-	protected String generateMbBitFieldDecode(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		
-		StringBuilder sb = new StringBuilder(indent);
-        // Multiple occurrences of byte value blocks will result in multiple declarations
-        // unless each is named uniquely.
-        String varName = "packedValue_" + ordinal;
-		sb.append("byte " + varName + ";");
-		sb.append(cr);
-		
-		// RG HERE!
-		
-		int i = 0;
-		while(i < bitFieldList.size())
-		{
-			sb.append(indent + varName + " = EncodingUtils.readByte(buffer);" + cr);
-			
-			for(int j = 0; i < bitFieldList.size() && j < 8; i++, j++)
-			{
-				sb.append(indent + bitFieldList.get(i) + " = ( " + varName + " & (byte) (1 << " + j + ") ) != 0;" + cr); 
-			}
-		}
-		return sb.toString();
-	}
-	
-	protected String generateMbFieldToString(String domain, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		StringBuffer sb = new StringBuffer();
-        if (domain.compareTo("longstr") == 0)
-        {
-		    sb.append(Utils.createSpaces(indentSize) +
-			    "buf.append(\"  " + fieldName + ": \" + (" + fieldName +
-                " == null ? \"<null>\" : new String(" + fieldName + ")));" + cr);		
-        }
-        else
-        {
-		    sb.append(Utils.createSpaces(indentSize) +
-			    "buf.append(\"  " + fieldName + ": \" + " + fieldName + ");" + cr);		
-        }
-		return sb.toString();
-	}
-	
-	protected String generateMbBitFieldToString(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer();
-		for (int i=0; i<bitFieldList.size(); i++)
-		{
-			String bitFieldName = bitFieldList.get(i);
-			sb.append(indent + "buf.append(\"  " + bitFieldName + ": \" + " + bitFieldName +
-				");" + cr);
-		}		
-		return sb.toString();
-	}
-
-	// Methods for PropertyContentHeader classes
-
-	protected String generatePchClearMethod(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		// This is one case where the ordinal info is the only significant factor,
-		// the domain info plays no part. Defer to the mangled version; the code would be
-		// identical anyway...
-		return generatePchMangledClearMethod(field, indentSize, tabSize, nextFlag);		
-	}
-		
-	protected String generatePchMangledClearMethod(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		sb.append(indent + "public void clear" + Utils.firstUpper(field.name) +
-				"()" + cr);
-		sb.append(indent + "{" + cr);
-		
-		// If there is more than one ordinal for this field or the ordinal does not
-		// apply to all known versions, then we need to generate version checks so
-		// we know which fieldProperty to clear.
-		if (field.ordinalMap.size() == 1 &&
-			field.ordinalMap.get(field.ordinalMap.firstKey()).size() == globalVersionSet.size())
-		{
-			int ordinal = field.ordinalMap.firstKey();
-			sb.append(indent + tab + "clearEncodedForm();" + cr);
-			sb.append(indent + tab + "propertyFlags[" + ordinal + "] = false;" + cr);
-		}
-		else
-		{
-			Iterator<Integer> oItr = field.ordinalMap.keySet().iterator();
-			while (oItr.hasNext())
-			{
-				int ordinal = oItr.next();
-				AmqpVersionSet versionSet = field.ordinalMap.get(ordinal);
-				sb.append(indent + tab);
-				if (ordinal != field.ordinalMap.firstKey())
-					sb.append("else ");
-				sb.append("if (");
-				sb.append(generateVersionCheck(versionSet));
-				sb.append(")" + cr);
-				sb.append(indent + tab + "{" + cr);
-				sb.append(indent + tab + tab + "clearEncodedForm();" + cr);
-				sb.append(indent + tab + tab + "propertyFlags[" + ordinal + "] = false;" + cr);
-				sb.append(indent + tab + "}" + cr);
-			}
-		}
-		sb.append(indent + "}" + cr);
-		sb.append(cr);
-		return sb.toString();		
-	}
-	
-	protected String generatePchGetMethod(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer(indent + "public " + codeType + " get" +
-			Utils.firstUpper(field.name) + "()" + cr);
-		sb.append(indent + "{" + cr);
-		sb.append(indent + tab + "decodeIfNecessary();" + cr);
-		sb.append(indent + tab + "return " + field.name + ";" + cr);
-		sb.append(indent + "}" + cr);
-		sb.append(cr);		
-		return sb.toString();		
-	}
-		
-	protected String generatePchMangledGetMethod(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer(indent + "public <T> T get" +
-			Utils.firstUpper(field.name) +
-			"(Class<T> classObj) throws AMQProtocolVersionException" + cr);
-		sb.append(indent + "{" + cr);		
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			String domainName = dItr.next();
-			AmqpVersionSet versionSet = field.domainMap.get(domainName);
-			String codeType = getGeneratedType(domainName, versionSet.first());
-			sb.append(indent + tab + "if (classObj.equals(" + codeType +
-				".class)) // AMQP Version(s): " + versionSet + cr);
-			sb.append(indent + tab + "{" + cr);		
-			sb.append(indent + tab + tab + "decodeIfNecessary();" + cr);
-			sb.append(indent + tab + tab + "return (T)(Object)" + field.name + "_" +
-				(domainCntr++) + ";" + cr);
-			sb.append(indent + tab + "}" + cr);		
-		}
-		sb.append(indent + tab +
-		    "throw new AMQProtocolVersionException(\"None of the AMQP versions defines \" +" +
-			cr + "            \"field \\\"" + field.name +
-			"\\\" as domain \\\"\" + classObj.getName() + \"\\\".\");" + cr);
-		sb.append(indent + "}" + cr);		
-		sb.append(cr);		
-		return sb.toString();		
-	}
-	
-	protected String generatePchSetMethod(String codeType, AmqpField field,
-		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		sb.append(indent + "public void set" + Utils.firstUpper(field.name) +
-		    "(" + codeType + " " + field.name + ")" + cr);
-		sb.append(indent + "{" + cr);
-		
-		// If there is more than one ordinal for this field or the ordinal does not
-		// apply to all known versions, then we need to generate version checks so
-		// we know which fieldProperty to clear.
-		if (field.ordinalMap.size() == 1 &&
-			field.ordinalMap.get(field.ordinalMap.firstKey()).size() == globalVersionSet.size())
-		{
-			int ordinal = field.ordinalMap.firstKey();
-			sb.append(indent + tab + "clearEncodedForm();" + cr);
-			sb.append(indent + tab + "propertyFlags[" + ordinal + "] = true;" + cr);
-			sb.append(indent + tab + "this." + field.name + " = " + field.name + ";" + cr);
-		}
-		else
-		{
-			Iterator<Integer> oItr = field.ordinalMap.keySet().iterator();
-			while (oItr.hasNext())
-			{
-				int ordinal = oItr.next();
-				AmqpVersionSet oVersionSet = field.ordinalMap.get(ordinal);
-				sb.append(indent + tab);
-				if (ordinal != field.ordinalMap.firstKey())
-					sb.append("else ");
-				sb.append("if (");
-				sb.append(generateVersionCheck(oVersionSet));
-				sb.append(")" + cr);
-				sb.append(indent + tab + "{" + cr);			
-				sb.append(indent + tab + tab + "clearEncodedForm();" + cr);
-				sb.append(indent + tab + tab + "propertyFlags[" + ordinal + "] = true;" + cr);
-				sb.append(indent + tab + tab + "this." + field.name + " = " + field.name + ";" + cr);
-				sb.append(indent + tab + "}" + cr);
-			}
-		}
-		sb.append(indent + "}" + cr);
-		sb.append(cr);
-		return sb.toString();		
-	}
-		
-	protected String generatePchMangledSetMethod(AmqpField field, int indentSize,
-		int tabSize, boolean nextFlag)
-		throws AmqpTypeMappingException
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		
-		Iterator<String> dItr = field.domainMap.keySet().iterator();
-		int domainCntr = 0;
-		while (dItr.hasNext())
-		{
-			String domainName = dItr.next();
-			AmqpVersionSet versionSet = field.domainMap.get(domainName);
-			String codeType = getGeneratedType(domainName, versionSet.first());
-			
-			// Find ordinal with matching version
-			AmqpVersionSet commonVersionSet = new AmqpVersionSet();
-			Iterator<Integer> oItr = field.ordinalMap.keySet().iterator();
-			while (oItr.hasNext())
-			{
-				int ordinal = oItr.next();
-				AmqpVersionSet oVersionSet = field.ordinalMap.get(ordinal);
-				Iterator<AmqpVersion> vItr = oVersionSet.iterator();
-				boolean first = true;
-				while (vItr.hasNext())
-				{
-					AmqpVersion thisVersion = vItr.next();
-					if (versionSet.contains(thisVersion))
-						commonVersionSet.add(thisVersion);
-				}
-				if (!commonVersionSet.isEmpty())
-				{
-					sb.append(indent + "public void set" + Utils.firstUpper(field.name) +
-						    "(" + codeType + " " + field.name + ")" + cr);
-					sb.append(indent + "{" + cr);
-					sb.append(indent + tab);
-					if (!first)
-						sb.append("else ");
-					sb.append("if (");
-					sb.append(generateVersionCheck(commonVersionSet));
-					sb.append(")" + cr);
-					sb.append(indent + tab + "{" + cr);
-					sb.append(indent + tab + tab + "clearEncodedForm();" + cr);
-					sb.append(indent + tab + tab + "propertyFlags[" + ordinal + "] = true;" + cr);
-					sb.append(indent + tab + tab + "this." + field.name + "_" + (domainCntr++) +
-						" = " + field.name + ";" + cr);
-					sb.append(indent + tab + "}" + cr);
-					sb.append(indent + "}" + cr);
-					sb.append(cr);
-					first = false;
-				}
-			}
-		}
-		return sb.toString();		
-	}
-
-	protected String generatePchFieldSize(String domainType, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer(indent + "if (propertyFlags[" + ordinal + "]) // " +
-			fieldName + ": " + domainType + cr);
-		sb.append(indent + Utils.createSpaces(tabSize) + "size += " +
-			typeMap.get(domainType).size.replaceAll("#", fieldName) + ";" + cr);
-		sb.append(cr);
-		return sb.toString();
-	}
-	
-	protected String generatePchBitArrayFieldSize(ArrayList<String> bitFieldList,
-			int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		String comment = bitFieldList.size() == 1 ?
-			bitFieldList.get(0) + ": bit" :
-			"Combinded bits: " + bitFieldList;
-		StringBuffer sb = new StringBuffer();
-				
-		if (bitFieldList.size() == 1) // single bit
-		{
-			sb.append(indent + "if (propertyFlags[" + (ordinal - 1) + "]) // " + comment + cr);
-			sb.append(indent + tab + "size += " +
-				typeMap.get("bit").size.replaceAll("~", "1") + ";" + cr);
-		}
-		else // multiple bits - up to 8 are combined into one byte
-		{
-			String bitCntrName = "bitCntr_" + ordinal;
-			int startOrdinal = ordinal - bitFieldList.size();
-			sb.append(indent + "// " + comment + cr);
-			sb.append(indent + "int " + bitCntrName + " = 0;" + cr);
-			sb.append(indent + "for (int i=" + startOrdinal + "; i<" + ordinal + "; i++)" + cr);
-			sb.append(indent + "{" + cr);
-			sb.append(indent + tab + "if (propertyFlags[i])" + cr);
-			sb.append(indent + tab + tab + bitCntrName + "++;" + cr);
-			sb.append(indent + "}" + cr);
-			sb.append(indent + "size += " +
-				typeMap.get("bit").size.replaceAll("~", bitCntrName +
-					" > 0 ? ((" + bitCntrName + " - 1) / 8) + 1 : 0") + ";" + cr);
-		}
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchFieldEncode(String domainType, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer();
-		sb.append(indent + "if (propertyFlags[" + ordinal + "]) // " + fieldName + ": " +
-			domainType + cr);
-		sb.append(indent + Utils.createSpaces(tabSize) +
-			typeMap.get(domainType).encodeExpression.replaceAll("#", fieldName) + ";" + cr);
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchBitFieldEncode(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		String comment = bitFieldList.size() == 1 ?
-			bitFieldList.get(0) + ": bit" :
-			"Combinded bits: " + bitFieldList;
-		StringBuffer sb = new StringBuffer();
-		
-		if (bitFieldList.size() == 1) // single bit
-		{
-			sb.append(indent + "if (propertyFlags[" + (ordinal - 1) + "]) // " +
-				bitFieldList.get(0) + ": bit" + cr);
-			sb.append(indent + tab + typeMap.get("bit").encodeExpression.replaceAll("#",
-				"new boolean[] {" + bitFieldList.get(0) + "}") + ";" + cr);
-		}
-		else // multiple bits - up to 8 are combined into one byte
-		{
-			int startOrdinal = ordinal - bitFieldList.size();
-			String bitCntrName = "bitCntr" + startOrdinal;
-			sb.append(indent + "// " + comment + cr);
-			sb.append(indent + "int " + bitCntrName + " = 0;" + cr);
-			sb.append(indent + "for (int i=" + startOrdinal + "; i<=" + (ordinal - 1) + "; i++)" + cr);
-			sb.append(indent + "{" + cr);
-			sb.append(indent + tab + "if (propertyFlags[i])" + cr);
-			sb.append(indent + tab + tab + bitCntrName + "++;" + cr);
-			sb.append(indent + "}" + cr);
-			sb.append(indent + "if (" + bitCntrName + " > 0) // Are any of the property bits set?" + cr);
-			sb.append(indent + "{" + cr);
-			sb.append(indent + tab + "boolean[] fullBitArray = new boolean[] { ");
-			for (int i=0; i<bitFieldList.size(); i++)
-			{
-				if (i != 0)
-					sb.append(", ");
-				sb.append(bitFieldList.get(i));
-			}
-			sb.append(" };" + cr);
-			sb.append(indent + tab + "boolean[] flaggedBitArray = new boolean[" +bitCntrName +
-				"];" + cr);
-			sb.append(indent + tab + bitCntrName + " = 0;" + cr);
-			sb.append(indent + tab + "for (int i=" + startOrdinal + "; i<=" + (ordinal - 1) +
-				"; i++)" + cr);
-			sb.append(indent + tab + "{" + cr);
-			sb.append(indent + tab + tab+ "if (propertyFlags[i])" + cr);
-			sb.append(indent + tab + tab + tab + "flaggedBitArray[" + bitCntrName +
-				"++] = fullBitArray[i];" + cr);
-			sb.append(indent + tab + "}" + cr);
-			sb.append(indent + tab + typeMap.get("bit").encodeExpression.replaceAll("#",
-					"flaggedBitArray") + ";" + cr);
-			sb.append(indent + "}" + cr);
-		}
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchFieldDecode(String domainType, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer();
-		sb.append(indent + "if (propertyFlags[" + ordinal + "]) // " + fieldName + ": " +
-				domainType + cr);
-		sb.append(indent + Utils.createSpaces(tabSize) +
-			typeMap.get(domainType).decodeExpression.replaceAll("#", fieldName) + ";" + cr);
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchBitFieldDecode(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		String comment = bitFieldList.size() == 1 ?
-				bitFieldList.get(0) + ": bit" :
-				"Combinded bits: " + bitFieldList;
-		StringBuffer sb = new StringBuffer();
-			
-		if (bitFieldList.size() == 1) // single bit
-		{
-			sb.append(indent + "if (propertyFlags[" + (ordinal - 1) + "]) // " +
-				bitFieldList.get(0) + ": bit" + cr);
-			sb.append(indent + "{" + cr);
-			sb.append(indent + tab + typeMap.get("bit").decodeExpression.replaceAll("#",
-					"boolean[] flaggedBitArray") + ";" + cr);
-			sb.append(indent + tab + bitFieldList.get(0) + " = flaggedBitArray[0];" + cr);
-			sb.append(indent + "}" + cr);
-		}
-		else // multiple bits - up to 8 are combined into one byte
-		{
-			int startOrdinal = ordinal - bitFieldList.size();
-			String bitCntr = "bitCntr" + startOrdinal;
-			sb.append(indent + "// " + comment + cr);
-			sb.append(indent + "int " + bitCntr + " = 0;" + cr);
-			sb.append(indent + "for (int i=" + startOrdinal + "; i<=" + (ordinal - 1) + "; i++)" + cr);
-			sb.append(indent + "{" + cr);
-			sb.append(indent + tab + "if (propertyFlags[i])" + cr);
-			sb.append(indent + tab + tab + bitCntr + "++;" + cr);
-			sb.append(indent + "}" + cr);
-			sb.append(indent + "if (" + bitCntr + " > 0) // Are any of the property bits set?" + cr);
-			sb.append(indent + "{" + cr);
-			sb.append(indent + tab + typeMap.get("bit").decodeExpression.replaceAll("#",
-					"boolean[] flaggedBitArray") + ";" + cr);
-			sb.append(indent + tab + bitCntr + " = 0;" + cr);
-			for (int i=0; i<bitFieldList.size(); i++)
-			{
-				sb.append(indent + tab + "if (propertyFlags[" + (startOrdinal + i) + "])" + cr);
-				sb.append(indent + tab + tab + bitFieldList.get(i) + " = flaggedBitArray[" +
-					bitCntr + "++];" + cr);
-			}
-			sb.append(indent + "}" + cr);
-		}
-
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchGetPropertyFlags(String domainType, String fieldName,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		int word = ordinal / 15;
-		int bit = 15 - (ordinal % 15);
-		sb.append(indent + "if (propertyFlags[" + ordinal + "]) // " + fieldName + ": " +
-			domainType + cr);
-		sb.append(indent + tab + "compactPropertyFlags[" + word + "] |= (1 << " +
-			bit + ");" + cr);
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchBitGetPropertyFlags(ArrayList<String> bitFieldList,
-		int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		int startOrdinal = ordinal - bitFieldList.size();
-		
-		for (int i=0; i<bitFieldList.size(); i++)
-		{
-			int thisOrdinal = startOrdinal + i;
-			int word = thisOrdinal / 15;
-			int bit = 15 - (thisOrdinal % 15);
-			sb.append(indent + "if (propertyFlags[" + thisOrdinal + "])" + cr);
-			sb.append(indent + tab + "compactPropertyFlags[" + word +
-					"] |= (1 << " + bit + ");" + cr);
-		}
-		
-		sb.append(cr);
-		return sb.toString();
-	}
-
-	protected String generatePchSetPropertyFlags(String domainType, String fieldName,
-			int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer();
-		int word = ordinal / 15;
-		int bit = 15 - (ordinal % 15);
-		sb.append(indent + "propertyFlags[" + ordinal + "] = (compactPropertyFlags[" +
-			word + "] & (1 << " + bit + ")) > 0;" + cr);
-		return sb.toString();
-	}
-	
-	protected String generatePchBitSetPropertyFlags(ArrayList<String> bitFieldList,
-			int ordinal, int indentSize, int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		StringBuffer sb = new StringBuffer();
-		int startOrdinal = ordinal - bitFieldList.size();
-			
-		for (int i=0; i<bitFieldList.size(); i++)
-		{
-			int thisOrdinal = startOrdinal + i;
-			int word = thisOrdinal / 15;
-			int bit = 15 - (thisOrdinal % 15);
-			sb.append(indent + "propertyFlags[" + thisOrdinal + "] = (compactPropertyFlags[" +
-				word + "] & (1 << " + bit + ")) > 0;" + cr);
-		}		
-		return sb.toString();
-	}
-	
-	private String generatePchPropertyFlagsDeclare()
-	{
-		return "private boolean[] propertyFlags;";
-	}
-	
-	private String generatePchPropertyFlagsInitializer(int totNumFields)
-	{
-		return "propertyFlags = new boolean[" + totNumFields + "];";
-	}
-	
-	private String generatePchCompactPropertyFlagsInitializer(AmqpClass thisClass, int indentSize,
-		int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		Iterator<AmqpVersion> vItr = globalVersionSet.iterator();
-		while (vItr.hasNext())
-		{
-			AmqpVersion version = vItr.next();
-			int numBytes = ((thisClass.fieldMap.getNumFields(version) - 1) / 15) + 1;
-			
-			sb.append(indent);
-			if (!version.equals(globalVersionSet.first()))
-				sb.append("else ");
-			sb.append("if ( major == " + version.getMajor() + " && minor == " +
-				version.getMinor() + " )" + cr);
-			sb.append(indent + tab + "compactPropertyFlags = new int[] { ");
-			for (int i=0; i<numBytes; i++)
-			{
-				if (i!= 0)
-					sb.append(", ");
-				sb.append(i < numBytes - 1 ? "1" : "0"); // Set the "continue" flag where required
-			}
-			sb.append(" };" + cr);
-		}
-		return sb.toString();
-	}
-	
-	private String generatePchCompactPropertyFlagsCheck(AmqpClass thisClass, int indentSize,
-		int tabSize)
-	{
-		String indent = Utils.createSpaces(indentSize);
-		String tab = Utils.createSpaces(tabSize);
-		StringBuffer sb = new StringBuffer();
-		Iterator<AmqpVersion> vItr = globalVersionSet.iterator();
-		while (vItr.hasNext())
-		{
-			AmqpVersion version = vItr.next();
-			int numFields = thisClass.fieldMap.getNumFields(version);
-			int numBytes = ((numFields - 1) / 15) + 1;
-			
-			sb.append(indent);
-			if (!version.equals(globalVersionSet.first()))
-				sb.append("else ");
-			sb.append("if ( major == " + version.getMajor() + " && minor == " +
-				version.getMinor() + " && compactPropertyFlags.length != " + numBytes + " )" + cr);
-			sb.append(indent + tab +
-				"throw new AMQProtocolVersionException(\"Property flag array size mismatch:\" +" + cr);
-			sb.append(indent + tab + tab + "\"(Size found: \" + compactPropertyFlags.length +" + cr);
-			sb.append(indent + tab + tab + "\") Version " + version + " has " + numFields +
-				" fields which requires an int array of size " + numBytes + ".\");" + cr);
-		}
-		return sb.toString();
-	}
-	
-	private String generateVersionCheck(AmqpVersionSet v)
-        throws AmqpTypeMappingException
-	{
-		StringBuffer sb = new StringBuffer();
-		AmqpVersion[] versionArray = new AmqpVersion[v.size()];
-		v.toArray(versionArray);
-		for (int i=0; i<versionArray.length; i++)
-		{
-			if (i != 0)
-				sb.append(" || ");
-			if (versionArray.length > 1)
-				sb.append("(");
-			sb.append("major == (byte)" + versionArray[i].getMajor() + " && minor == (byte)" +
-				versionArray[i].getMinor());
-			if (versionArray.length > 1)
-				sb.append(")");
-		}
-		return sb.toString();
-	}
-	
-	private String camelCaseName(String name, boolean upperFirstFlag)
-	{
-		StringBuffer ccn = new StringBuffer();
-		String[] toks = name.split("[-_.\\ ]");
-		for (int i=0; i<toks.length; i++)
-		{
-			StringBuffer b = new StringBuffer(toks[i]);
-			if (upperFirstFlag || i>0)
-				b.setCharAt(0, Character.toUpperCase(toks[i].charAt(0)));
-			ccn.append(b);
-		}
-		return ccn.toString();
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/LanguageConverter.java b/cpp/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
deleted file mode 100644
index cb0a14e3bc..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-public interface LanguageConverter
-{
-	public void setDomainMap(AmqpDomainMap domainMap);
-	public AmqpDomainMap getDomainMap();
-
-    public void setConstantSet(AmqpConstantSet constantSet);
-    public AmqpConstantSet getConstantSet();
-	
-	public void setModel(AmqpModel model);
-	public AmqpModel getModel();
-	
-	public String prepareClassName(String className);
-	public String prepareMethodName(String methodName);
-	public String prepareDomainName(String domainName);
-	public String getDomainType(String domainName, AmqpVersion version) throws AmqpTypeMappingException;
-	public String getGeneratedType(String domainName, AmqpVersion version) throws AmqpTypeMappingException;
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/Main.java b/cpp/gentools/src/org/apache/qpid/gentools/Main.java
deleted file mode 100644
index a25ddd103c..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/Main.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-public class Main
-{
-    private static final String defaultOutDir = ".." + Utils.fileSeparator + "gen";
-    private static final String defaultCppTemplateDir = ".." + Utils.fileSeparator + "templ.cpp";
-    private static final String defaultDotnetTemplateDir = ".." + Utils.fileSeparator + "templ.net";
-    private static final String defaultJavaTemplateDir = ".." + Utils.fileSeparator + "templ.java";
-    
-    private enum GeneratorLangEnum { CPP, DOTNET, JAVA }
-    
-	private DocumentBuilder docBuilder;
-	private AmqpVersionSet versionSet;
-	private Generator generator;
-    private AmqpConstantSet constants;
-	private AmqpDomainMap domainMap;
-	private AmqpModel model;
-    
-    private String outDir;
-    private String tmplDir;
-    private GeneratorLangEnum generatorLang;
-    private ArrayList<String> xmlFiles;
-    private File[] modelTemplateFiles;
-    private File[] classTemplateFiles;
-    private File[] methodTemplateFiles;
-    private File[] fieldTemplateFiles;
-	
-	public Main() throws ParserConfigurationException
-	{
-		docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-		versionSet = new AmqpVersionSet();
-        xmlFiles = new ArrayList<String>();
-	}
-	
-	public void run(String[] args)
-		throws 	IOException,
-				SAXException,
-				AmqpParseException,
-				AmqpTypeMappingException,
-				AmqpTemplateException,
-				TargetDirectoryException,
-				IllegalAccessException,
-		    	InvocationTargetException
-	{
-		modelTemplateFiles = new File[]{};
-		classTemplateFiles = new File[]{};
-		methodTemplateFiles = new File[]{};
-		fieldTemplateFiles = new File[]{};
-        
-        // 0. Initialize
-        outDir = defaultOutDir;
-        tmplDir = null;
-        generatorLang = GeneratorLangEnum.CPP; // Default generation language
-        xmlFiles.clear();
-        processArgs(args);
-        switch (generatorLang)
-        {
-        case JAVA:
-        	prepareJava();
-        	break;
-        case DOTNET:
-        	prepareDotnet();
-        	break;
-        default:
-            prepareCpp();
-        }
-
-		if (modelTemplateFiles.length == 0 && classTemplateFiles.length == 0 &&
-			methodTemplateFiles.length == 0 && fieldTemplateFiles.length == 0)
-			System.err.println("  WARNING: No template files.");
-		
-		// 1. Suck in all the XML spec files provided on the command line
-        analyzeXML();
-		
-		// 2. Load up all templates
-        try
-        {
-		generator.initializeTemplates(modelTemplateFiles, classTemplateFiles,
-			methodTemplateFiles, fieldTemplateFiles);
-        }
-        catch (FileNotFoundException e)
-        {
-        	System.err.println("Error: Unable to load template file (check -t option on command-line):");
-        	System.err.println(e.getMessage());
-        	return;
-        }
-		
-		// 3. Generate output
-		generator.generate(new File(outDir));
-		
-		System.out.println("Files generated: " + generator.getNumberGeneratedFiles());
-		System.out.println("Done.");
-	}
-
-    private void processArgs(String[] args)
-    {
-        // Crude but simple...
-        for (int i=0; i<args.length; i++)
-        {
-            String arg = args[i];
-            if (arg.charAt(0) == '-')
-            {
-                switch (arg.charAt(1))
-                {
-                    case 'c':
-                    case 'C':
-                    	generatorLang = GeneratorLangEnum.CPP;
-                        break;
-                    case 'j':
-                    case 'J':
-                    	generatorLang = GeneratorLangEnum.JAVA;
-                        break;
-                    case 'n':
-                    case 'N':
-                    	generatorLang = GeneratorLangEnum.DOTNET;
-                        break;
-                    case 'o':
-                    case 'O':
-                        if (++i < args.length)
-                        {
-                            outDir = args[i];
-                        }
-                       break;
-                    case 't':
-                    case 'T':
-                        if (++i < args.length)
-                        {
-                            tmplDir = args[i];
-                        }
-                        break;
-                }
-            }
-            else
-            {
-                xmlFiles.add(args[i]);
-            }
-        }
-    }
-    
-    private void prepareJava()
-    {
-        if (tmplDir == null)
-            tmplDir = defaultJavaTemplateDir;
-        System.out.println("Java generation mode.");
-        generator = new JavaGenerator(versionSet);
-        constants = new AmqpConstantSet(generator);
-        domainMap = new AmqpDomainMap(generator);
-        model = new AmqpModel(generator);       
-        modelTemplateFiles = new File[]
-        {
-            new File(tmplDir + Utils.fileSeparator + "MethodRegistryClass.tmpl"),
-            new File(tmplDir + Utils.fileSeparator + "AmqpConstantsClass.tmpl"),
-            new File(tmplDir + Utils.fileSeparator + "ProtocolVersionListClass.tmpl")
-        };
-        classTemplateFiles = new File[]
-        {
-//            new File(tmplDir + Utils.fileSeparator + "PropertyContentHeaderClass.tmpl")
-        };
-        methodTemplateFiles = new File[]
-        {
-            new File(tmplDir + Utils.fileSeparator + "MethodBodyClass.tmpl")
-        };
-    }
-    
-    private void prepareDotnet()
-    {
-        if (tmplDir == null)
-            tmplDir = defaultDotnetTemplateDir;
-        System.out.println(".NET generation mode.");
-        generator = new DotnetGenerator(versionSet);
-        constants = new AmqpConstantSet(generator);
-        domainMap = new AmqpDomainMap(generator);
-        model = new AmqpModel(generator);       
-    	// TODO: Add templated that should be handled in here...
-       modelTemplateFiles = new File[]
-        {
-//          new File(tmplDir + Utils.fileSeparator + "XXXClass.tmpl"),
-        };
-        classTemplateFiles = new File[]
-        {
-//          new File(tmplDir + Utils.fileSeparator + "XXXClass.tmpl"),
-        };
-        methodTemplateFiles = new File[]
-        {
-//          new File(tmplDir + Utils.fileSeparator + "XXXClass.tmpl"),
-        };
-   }
-   
-    private void prepareCpp()
-    {
-        if (tmplDir == null)
-            tmplDir = defaultCppTemplateDir;
-        System.out.println("C++ generation mode.");
-        generator = new CppGenerator(versionSet);
-        constants = new AmqpConstantSet(generator);
-        domainMap = new AmqpDomainMap(generator);
-        model = new AmqpModel(generator);           
-        modelTemplateFiles = new File[]
-        {
-            new File(tmplDir + Utils.fileSeparator + "AMQP_ServerOperations.h.tmpl"),
-            new File(tmplDir + Utils.fileSeparator + "AMQP_ClientOperations.h.tmpl"),
-            new File(tmplDir + Utils.fileSeparator + "AMQP_Constants.h.tmpl"),
-	    new File(tmplDir + Utils.fileSeparator + "AMQP_HighestVersion.h.tmpl")
-        };
-        methodTemplateFiles = new File[]
-        {
-            new File(tmplDir + Utils.fileSeparator + "MethodBodyClass.h.tmpl")
-        };        
-    }
-
-    private void analyzeXML()
-        throws IOException, SAXException, AmqpParseException, AmqpTypeMappingException
-    {
-        System.out.println("XML files: " + xmlFiles);
-        for (String filename : xmlFiles)
-        {
-            File f = new File(filename);
-            if (f.exists())
-            {
-                // 1a. Initialize dom
-                System.out.print("  \"" + filename + "\":");
-                Document doc = docBuilder.parse(new File(filename));
-                Node amqpNode = Utils.findChild(doc, Utils.ELEMENT_AMQP);
-                
-                // 1b. Extract version (major and minor) from the XML file
-                int major = Utils.getNamedIntegerAttribute(amqpNode, Utils.ATTRIBUTE_MAJOR);
-                int minor = Utils.getNamedIntegerAttribute(amqpNode, Utils.ATTRIBUTE_MINOR);
-                AmqpVersion version = new AmqpVersion(major, minor);
-                System.out.println(" Found version " + version.toString() + ".");
-                versionSet.add(version);
-                
-                // 1c. Extract domains
-                constants.addFromNode(amqpNode, 0, version);
-                
-                // 1d. Extract domains
-                domainMap.addFromNode(amqpNode, 0, version);
-                
-                // 1e. Extract class/method/field heirarchy
-                model.addFromNode(amqpNode, 0, version);
-            }
-            else
-                System.err.println("ERROR: AMQP XML file \"" + filename + "\" not found.");
-        }
-// *** DEBUG INFO ***  Uncomment bits from this block to see lots of stuff....
-//      System.out.println();
-//      System.out.println("*** Debug output ***");
-//      System.out.println();
-//      versionSet.print(System.out, 0, 2); // List of loaded versions
-//      System.out.println();
-//      constants.print(System.out, 0, 2); // List of constants
-//      System.out.println();
-//      domainMap.print(System.out, 0, 2); // List of domains
-//      System.out.println();
-//      model.print(System.out, 0, 2); // Internal version map model
-//      System.out.println();
-//      System.out.println("*** End debug output ***");
-//      System.out.println();        
-    }
-    
-	public static void main(String[] args)
-	{
-		int exitCode = 1;
-		// TODO: This is a simple and klunky way of hangling command-line args, and could be improved upon.
-		if (args.length < 2)
-		{
-			usage();
-		}
-		else
-		{
-			try
-			{
-				new Main().run(args);
-				exitCode = 0;
-			}
-			catch (IOException e) { e.printStackTrace(); }
-			catch (ParserConfigurationException e) { e.printStackTrace(); }
-			catch (SAXException e) { e.printStackTrace(); }
-			catch (AmqpParseException e) { e.printStackTrace(); }
-			catch (AmqpTypeMappingException e) { e.printStackTrace(); }
-			catch (AmqpTemplateException e) { e.printStackTrace(); }
-			catch (TargetDirectoryException e) { e.printStackTrace(); }
-			catch (IllegalAccessException e) { e.printStackTrace(); }
-			catch (InvocationTargetException e) { e.printStackTrace(); }
-		}
-		System.exit(exitCode);
-	}
-
-	public static void usage()
-	{
-		System.out.println("AMQP XML generator v.0.0");
-		System.out.println("Usage: Main -c|-j [-o outDir] [-t tmplDir] XMLfile [XMLfile ...]");
-		System.out.println("       where -c:         Generate C++.");
-		System.out.println("             -j:         Generate Java.");
-		System.out.println("             -n:         Generate .NET.");
-        System.out.println("             -o outDir:  Use outDir as the output dir (default=\"" + defaultOutDir + "\").");
-        System.out.println("             -t tmplDir: Find templates in tmplDir.");
-        System.out.println("                         Defaults: \"" + defaultCppTemplateDir + "\" for C++;");
-        System.out.println("                                   \"" + defaultJavaTemplateDir + "\" for java.");
-		System.out.println("             XMLfile is a space-separated list of AMQP XML files to be parsed.");
-	}
-	
-	public static String ListTemplateList(File[] list)
-	{
-		StringBuffer sb = new StringBuffer();
-		for (int i=0; i<list.length; i++)
-		{
-			if (i != 0)
-				sb.append(", ");
-			sb.append(list[i].getName());
-		}
-		return sb.toString();
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/NodeAware.java b/cpp/gentools/src/org/apache/qpid/gentools/NodeAware.java
deleted file mode 100644
index df4e0ecb02..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/NodeAware.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import org.w3c.dom.Node;
-
-/**
- * @author kpvdr
- * Interface allowing the addition of elements from a node in the
- * DOM of the AMQP specification. It is used by each of the model
- * elements in a recursive fashion to build the model.
- */
-public interface NodeAware
-{
-	/**
-	 * Add a model element from the current DOM node. All model elements must implement
-	 * this interface. If the node contains children that are also a part of the model,
-	 * then this method is called on new instances of those model elements.
-	 * @param n Node from which the current model element is to be added.
-	 * @param o Ordinal value of the current model elemet.
-	 * @param v Verion of the DOM from which the node comes.
-	 * @throws AmqpParseException
-	 * @throws AmqpTypeMappingException
-	 * @returns true if a node was added, false if not
-	 */
-	public boolean addFromNode(Node n, int o, AmqpVersion v)
-		throws AmqpParseException, AmqpTypeMappingException;
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/Printable.java b/cpp/gentools/src/org/apache/qpid/gentools/Printable.java
deleted file mode 100644
index a73878c506..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/Printable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import java.io.PrintStream;
-
-public interface Printable
-{
-	public void print(PrintStream out, int marginSize, int tabSize);
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java b/cpp/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
deleted file mode 100644
index cdaf381f0a..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-@SuppressWarnings("serial")
-public class TargetDirectoryException extends Exception
-{
-	public TargetDirectoryException(String msg)
-	{
-		super(msg);
-	}
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/Utils.java b/cpp/gentools/src/org/apache/qpid/gentools/Utils.java
deleted file mode 100644
index e1c4661acf..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/Utils.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-import org.w3c.dom.Attr;
-//import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class Utils
-{
-	public final static String fileSeparator = System.getProperty("file.separator");
-	public final static String lineSeparator = System.getProperty("line.separator");
-	
-	public final static String ATTRIBUTE_NAME = "name";
-	public final static String ATTRIBUTE_MAJOR = "major";
-	public final static String ATTRIBUTE_MINOR = "minor";
-	public final static String ATTRIBUTE_INDEX = "index";
-	public final static String ATTRIBUTE_LABEL = "label";
-	public final static String ATTRIBUTE_SYNCHRONOUS = "synchronous";
-	public final static String ATTRIBUTE_CONTENT = "content";
-	public final static String ATTRIBUTE_HANDLER = "handler";
-	public final static String ATTRIBUTE_DOMAIN = "domain";
-    public final static String ATTRIBUTE_VALUE = "value";
-	public final static String ATTRIBUTE_TYPE = "type"; // For compatibility with AMQP 8.0
-	
-	public final static String ELEMENT_AMQP = "amqp";
-	public final static String ELEMENT_CHASSIS = "chassis";
-	public final static String ELEMENT_CLASS = "class";
-	public final static String ELEMENT_CODEGEN = "codegen";
-    public final static String ELEMENT_CONSTANT = "constant";
-	public final static String ELEMENT_DOMAIN = "domain";
-	public final static String ELEMENT_METHOD = "method";
-	public final static String ELEMENT_FIELD = "field";
-	public final static String ELEMENT_VERSION = "version";
-	
-	// Attribute functions
-	
-	public static String getNamedAttribute(Node n, String attrName) throws AmqpParseException
-	{
-		NamedNodeMap nnm = n.getAttributes();
-		if (nnm == null)
-			throw new AmqpParseException("Node \"" + n.getNodeName() + "\" has no attributes.");
-		Attr a = (Attr)nnm.getNamedItem(attrName);
-		if (a == null)
-			throw new AmqpParseException("Node \"" + n.getNodeName() + "\" has no attribute \"" + attrName + "\".");
-		return a.getNodeValue();
-	}
-	
-	public static int getNamedIntegerAttribute(Node n, String attrName) throws AmqpParseException
-	{
-		return Integer.parseInt(getNamedAttribute(n, attrName));
-	}
-
-        public static int getNamedIntegerAttribute(Node node, String name, int defaultValue) throws AmqpParseException
-	{
-		NamedNodeMap attributes = node.getAttributes();
-		Attr a = attributes == null ? null : (Attr) attributes.getNamedItem(name);
-		return a == null ? defaultValue : Integer.parseInt(a.getNodeValue());
-	}
-	
-	// Element functions
-	
-	public static Node findChild(Node n, String eltName) throws AmqpParseException
-	{
-		NodeList nl = n.getChildNodes();
-		for (int i=0; i<nl.getLength(); i++)
-		{
-			Node cn = nl.item(i);
-			if (cn.getNodeName().compareTo(eltName) == 0)
-				return cn;
-		}
-		throw new AmqpParseException("Node \"" + n.getNodeName() +
-				"\" does not contain child element \"" + eltName + "\".");
-	}
-		
-	// String functions
-	
-	public static String firstUpper(String str)
-	{
-		if (!Character.isLowerCase(str.charAt(0)))
-			return str;
-		StringBuffer sb = new StringBuffer(str);
-		sb.setCharAt(0, Character.toUpperCase(str.charAt(0)));
-		return sb.toString();
-	}
-	
-	public static String firstLower(String str)
-	{
-		if (!Character.isUpperCase(str.charAt(0)))
-			return str;
-		StringBuffer sb = new StringBuffer(str);
-		sb.setCharAt(0, Character.toLowerCase(str.charAt(0)));
-		return sb.toString();
-	}
-	
-	public static String createSpaces(int cnt)
-	{
-		StringBuffer sb = new StringBuffer();
-		for (int i=0; i<cnt; i++)
-			sb.append(' ');
-		return sb.toString();
-	}
-    
-    public static boolean containsOnlyDigits(String str)
-    {
-        boolean foundNonDigit = false;
-        for (int i=0; i<str.length() && !foundNonDigit; i++)
-        {
-            if (!Character.isDigit(str.charAt(i)))
-            {
-                foundNonDigit = true;
-            }
-        }
-        return !foundNonDigit;
-    }
-    
-    public static boolean containsOnlyDigitsAndDecimal(String str)
-    {
-        boolean foundNonDigit = false;
-        int decimalCntr = 0;
-        for (int i=0; i<str.length() && !foundNonDigit && decimalCntr<2; i++)
-        {
-            char ch = str.charAt(i);
-            if (!(Character.isDigit(ch) || ch == '.'))
-            {
-                foundNonDigit = true;
-            }
-            else if (ch == '.')
-                decimalCntr++;
-        }
-        return !foundNonDigit && decimalCntr<2;
-    }
-}
diff --git a/cpp/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java b/cpp/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
deleted file mode 100644
index 1f6b9f1a6d..0000000000
--- a/cpp/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.gentools;
-
-public interface VersionConsistencyCheck
-{
-	public boolean isVersionConsistent(AmqpVersionSet globalVersionSet);
-}
diff --git a/cpp/gentools/templ.cpp/AMQP_Constants.h.tmpl b/cpp/gentools/templ.cpp/AMQP_Constants.h.tmpl
deleted file mode 100644
index 4631bc8de6..0000000000
--- a/cpp/gentools/templ.cpp/AMQP_Constants.h.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-&{AMQP_Constants.h}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
-	// NOTE: This file is intended to be included within the class structure of both
-	// the client and server operations classes. These need to have <sstream> included.
- 
- 	// Constant getValue methods
- 	
-%{TLIST} ${ch_get_value_method}
- 
\ No newline at end of file
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
deleted file mode 100644
index ee89386653..0000000000
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ /dev/null
@@ -1,62 +0,0 @@
-&{AMQP_MethodVersionMap.cpp}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
-
-#include <sstream>
-#include "qpid/framing/ProtocolVersionException.h"
-#include "AMQP_MethodVersionMap.h"
-
-namespace qpid
-{
-namespace framing
-{
-
-AMQP_MethodVersionMap::AMQP_MethodVersionMap()
-{
-%{CLIST} ${mc_create_method_body_map_entry}	
-}
-	
-AMQMethodBody* AMQP_MethodVersionMap::createMethodBody(u_int16_t classId, u_int16_t methodId, u_int8_t major, u_int8_t minor)
-{
-	iterator itr = find(createMapKey(classId, methodId, major, minor));
-	if (itr == end())
-	{
-		std::stringstream ss;
-		ss << "Unable to find MethodBody class for classId = " << classId << ", methodId = " <<
-		    methodId << ", AMQ protocol version = " << major << "-" << minor << ".";
-   		throw ProtocolVersionException(ss.str());
-   	}
-   	return (itr->second)(major, minor);		
-}
-
-u_int64_t AMQP_MethodVersionMap::createMapKey(u_int16_t classId, u_int16_t methodId, u_int8_t major, u_int8_t minor)
-{
-	return ((u_int64_t)classId<<48) + ((u_int64_t)methodId<<32) + ((u_int64_t)major<<16) + minor;
-}
-
-} /* namespace framing */
-} /* namespace qpid */
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
deleted file mode 100644
index 09611c8d31..0000000000
--- a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ /dev/null
@@ -1,72 +0,0 @@
-&{AMQP_ServerOperations.h}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
- 
-#ifndef qpid_framing_AMQP_ServerOperations__
-#define qpid_framing_AMQP_ServerOperations__
-
-#include "qpid/framing/ProtocolVersion.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQMethodBody;
-
-class Invocable 
-{
-protected:
-    Invocable() {}        
-    virtual ~Invocable() {}        
-};
-
-class AMQP_ServerOperations
-{
-protected:
-    ProtocolVersion version;
-
-public:
-    virtual ~AMQP_ServerOperations() {}
-
-    virtual ProtocolVersion getVersion() const = 0;
-    
-    // Include framing constant declarations
-    #include "AMQP_Constants.h"
-
-    // Inner classes
-
-%{CLIST} ${soh_inner_class}
-
-    // Method handler get methods
-
-%{CLIST} ${soh_method_handler_get_method}
-
-}; /* class AMQP_ServerOperations */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif
diff --git a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
deleted file mode 100644
index 5ffd2f2b4d..0000000000
--- a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ /dev/null
@@ -1,115 +0,0 @@
-&{${CLASS}${METHOD}Body.h}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
-
-#ifndef qpid_framing_${CLASS}${METHOD}Body__
-#define qpid_framing_${CLASS}${METHOD}Body__
-
-#include <string>
-#include <sstream>
-
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/${mb_base_class}.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/framing/FramingContent.h"
-#include "qpid/framing/SequenceNumberSet.h"
-#include "qpid/framing/AMQP_ServerOperations.h"
-#include "qpid/framing/MethodBodyConstVisitor.h"
-
-
-namespace qpid
-{
-namespace framing
-{
-${version_namespace_start}
- 
-class ${CLASS}${METHOD}Body : public AMQMethodBody
-{
-
-        // Method field declarations
-
-%{FLIST} ${mb_field_declaration}
-     
-
-public:
-    static const ClassId CLASS_ID= ${CLASS_ID_INIT};
-    static const MethodId METHOD_ID = ${METHOD_ID_INIT};
-
-    // Constructors and destructors
-
-${mb_constructor_with_initializers}
-
-    ${CLASS}${METHOD}Body(ProtocolVersion=ProtocolVersion()) {}
-    virtual ~${CLASS}${METHOD}Body() {}
-    
-    // Attribute get methods
-
-%{FLIST} ${mb_field_get_method}
-
-    // Helper methods
-    using  AMQMethodBody::accept;
-    void accept(MethodBodyConstVisitor& v) const { v.visit(*this); }
-
-    void print(std::ostream& out) const
-    {
-            out << "${CLASS}${METHOD}: ";
-%{FLIST} ${mb_field_print}
-    }
-
-    inline ClassId amqpClassId() const { return CLASS_ID; }
-    inline MethodId amqpMethodId() const { return METHOD_ID; }
-
-    u_int32_t size() const
-    {
-        u_int32_t sz = 0;
-%{FLIST} ${mb_body_size}
-        return sz;
-    }
-
-    void encode(Buffer& ${mb_buffer_param}) const
-    {
-%{FLIST} ${mb_encode}
-    }
-
-    inline void decode(Buffer& ${mb_buffer_param}, uint32_t=0)
-    {
-%{FLIST} ${mb_decode}
-    }       
-
-${mb_server_operation_invoke}
-
-${mb_server_operation_invoke2}
-
-}; // class ${CLASS}${METHOD}Body
-
-${version_namespace_end}
-} // namespace framing
-} // namespace qpid
-
-#endif
-
diff --git a/cpp/gentools/templ.java/AmqpConstantsClass.tmpl b/cpp/gentools/templ.java/AmqpConstantsClass.tmpl
deleted file mode 100644
index 8d459f2977..0000000000
--- a/cpp/gentools/templ.java/AmqpConstantsClass.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-&{AmqpConstants.java}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
- 
-package org.apache.qpid.framing;
-
-class AmqpConstants
-{
- 	// Constant getValue methods
- 	
-%{TLIST} ${const_get_method}
-	
-}
diff --git a/cpp/gentools/templ.java/MethodBodyClass.tmpl b/cpp/gentools/templ.java/MethodBodyClass.tmpl
deleted file mode 100644
index 42582fcb7c..0000000000
--- a/cpp/gentools/templ.java/MethodBodyClass.tmpl
+++ /dev/null
@@ -1,180 +0,0 @@
-&{${CLASS}${METHOD}Body.java}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
-
-package org.apache.qpid.framing;
-
-import java.util.HashMap;
-
-import org.apache.mina.common.ByteBuffer;
-
-public class ${CLASS}${METHOD}Body extends AMQMethodBody implements EncodableAMQDataBlock
-{
-    private static final AMQMethodBodyInstanceFactory factory = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(byte major, byte minor, ByteBuffer in, long size) throws AMQFrameDecodingException
-        {
-            return new ${CLASS}${METHOD}Body(major, minor, in);
-        }
-		
-	    public AMQMethodBody newInstance(byte major, byte minor, int clazzID, int methodID, ByteBuffer in, long size) throws AMQFrameDecodingException
-        {
-            return new ${CLASS}${METHOD}Body(major, minor, clazzID, methodID, in);
-        }
- 
-    };
-
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return factory;
-    }
-
-    public static HashMap<Integer, Integer> classIdMap = new HashMap<Integer, Integer>();
-    public static HashMap<Integer, Integer> methodIdMap = new HashMap<Integer, Integer>();
-    
-    private static void registerMethodId(byte major, byte minor, int methodId)
-    {
-        methodIdMap.put((0xff & (int) major) | ((0xff & (int) minor)<<8), methodId); 
-    }
-    
-    private static void registerClassId(byte major, byte minor, int classId)
-    {
-        classIdMap.put((0xff & (int) major) | ((0xff & (int) minor)<<8), classId); 
-    }
-    
-    
-    static
-    {
-        ${CLASS_ID_INIT}
-        ${METHOD_ID_INIT}
-    }
-
-    // Fields declared in specification
-%{FLIST}    ${field_declaration}
-
-    private final int _clazz;
-    private final int _method;
-
-    
-    // Constructor
-
-    public ${CLASS}${METHOD}Body(byte major, byte minor, ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-		this(major, minor, getClazz(major,minor), getMethod(major,minor), buffer);
-	}
-	
-    public ${CLASS}${METHOD}Body(byte major, byte minor, int clazzID, int methodID, ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-        super(major, minor);
-        _clazz = clazzID; 
-        _method = methodID; 
-%{FLIST}        ${mb_field_decode}
-    }
-    
-    public ${CLASS}${METHOD}Body(byte major, byte minor, int clazzID, int methodID
-%{FLIST}        ${mb_field_parameter_list}
-                                         )
-    {
-        super(major, minor);
-        _clazz = getClazz(major,minor); 
-        _method = getMethod(major,minor); 
-%{FLIST}        ${mb_field_body_initialize}
-    }
-    
-    public int getClazz() 
-    { 
-        return _clazz; 
-    }
-    
-    public int getMethod() 
-    { 
-        return _method; 
-    }
-
-    public static int getClazz(byte major, byte minor) 
-    { 
-        return classIdMap.get((0xff & (int) major) | ((0xff & (int) minor)<<8)); 
-    }
-    
-    public static int getMethod(byte major, byte minor) 
-    { 
-        return methodIdMap.get((0xff & (int) major) | ((0xff & (int) minor)<<8)); 
-    }
-    
-    
-    // Field methods        
-%{FLIST}    ${mb_field_get_method}
-
-    public int getBodySize()
-    {
-        int size = 0;
-%{FLIST}    ${mb_field_size}
-        return size;
-    }
-
-    protected void writeMethodPayload(ByteBuffer buffer)
-    {
-%{FLIST}    ${mb_field_encode}
-    }
-
-    public void populateMethodBodyFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-%{FLIST}    ${mb_field_decode}
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer(super.toString());
-%{FLIST}    ${mb_field_to_string}
-        return buf.toString();
-    }
-
-    public static ${CLASS}${METHOD}Body createMethodBody(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}
-        );
-    }
-}
diff --git a/cpp/gentools/templ.java/MethodRegistryClass.tmpl b/cpp/gentools/templ.java/MethodRegistryClass.tmpl
deleted file mode 100644
index 12e6fe250e..0000000000
--- a/cpp/gentools/templ.java/MethodRegistryClass.tmpl
+++ /dev/null
@@ -1,125 +0,0 @@
-&{MainRegistry.java}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
- 
-package org.apache.qpid.framing;
-
-import org.apache.log4j.Logger;
-import org.apache.mina.common.ByteBuffer;
-
-public class MainRegistry
-{
-    private static final Logger _log = Logger.getLogger(MainRegistry.class);
-
-    private static final int DEFAULT_MINOR_VERSION_COUNT = 10;
-    private static final int DEFAULT_MAJOR_VERSION_COUNT = 10;
-    
-    private static VersionSpecificRegistry[][] _specificRegistries = new VersionSpecificRegistry[DEFAULT_MAJOR_VERSION_COUNT][];
-    	
-    static
-    {
-%{CLIST}	${reg_map_put_method}
-    }
-    
-    public static AMQMethodBody get(short classID, short methodID, byte major, byte minor, ByteBuffer in, long size)
-        throws AMQFrameDecodingException
-    {
-		VersionSpecificRegistry registry = getVersionSpecificRegistry(major, minor);
-        AMQMethodBodyInstanceFactory bodyFactory = registry.getMethodBody(classID,methodID);
-		
-        if (bodyFactory == null)
-        {
-            throw new AMQFrameDecodingException(_log,
-                "Unable to find a suitable decoder for class " + classID + " and method " +
-                methodID + " in AMQP version " + major + "-" + minor + ".");
-        }
-        return bodyFactory.newInstance(major, minor, in, size);
-
-	    
-    }
-	
-	public static VersionSpecificRegistry getVersionSpecificRegistry(byte major, byte minor)
-	{
-		try
-		{
-			return _specificRegistries[(int)major][(int)minor];
-		}
-		catch (IndexOutOfBoundsException e)
-		{
-			return null;
-		}
-		catch (NullPointerException e)
-		{
-			return null;
-		}
-		
-		
-	}
-    
-	private static VersionSpecificRegistry addVersionSpecificRegistry(byte major, byte minor)
-	{
-		VersionSpecificRegistry[][] registries = _specificRegistries;
-		if(major >= registries.length)
-		{
-			_specificRegistries = new VersionSpecificRegistry[(int)major + 1][];
-			System.arraycopy(registries, 0, _specificRegistries, 0, registries.length);
-			registries = _specificRegistries;
-		}
-		if(registries[major] == null)
-		{
-			registries[major] = new VersionSpecificRegistry[ minor >= DEFAULT_MINOR_VERSION_COUNT ? minor + 1 : DEFAULT_MINOR_VERSION_COUNT ];
-		}
-		else if(registries[major].length <= minor)
-		{
-			VersionSpecificRegistry[] minorArray = registries[major];
-			registries[major] = new VersionSpecificRegistry[ minor + 1 ];
-			System.arraycopy(minorArray, 0, registries[major], 0, minorArray.length);
-			
-		}
-		
-		VersionSpecificRegistry newRegistry = new VersionSpecificRegistry(major,minor);
-		
-		registries[major][minor] = newRegistry;
-		
-		return newRegistry;
-	}
-		
-	private static void registerMethod(short classID, short methodID, byte major, byte minor, AMQMethodBodyInstanceFactory instanceFactory )
-	{
-		VersionSpecificRegistry registry = getVersionSpecificRegistry(major,minor);
-		if(registry == null)
-		{
-			registry = addVersionSpecificRegistry(major,minor);
-			
-		}
-		
-		registry.registerMethod(classID, methodID, instanceFactory);
-        
-    }
-
-    
-}
diff --git a/cpp/gentools/templ.java/PropertyContentHeaderClass.tmpl b/cpp/gentools/templ.java/PropertyContentHeaderClass.tmpl
deleted file mode 100644
index 3c147cf6b6..0000000000
--- a/cpp/gentools/templ.java/PropertyContentHeaderClass.tmpl
+++ /dev/null
@@ -1,207 +0,0 @@
-&{${CLASS}ContentHeaderProperties.java}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
- 
-package org.apache.qpid.framing;
-
-import org.apache.log4j.Logger;
-import org.apache.mina.common.ByteBuffer;
-
-public class ${CLASS}ContentHeaderProperties implements ContentHeaderProperties
-{
-    private static final Logger logger = Logger.getLogger(BasicContentHeaderProperties.class);
-
-    /**
-     * We store the encoded form when we decode the content header so that if we need to
-     * write it out without modifying it we can do so without incurring the expense of
-     * reencoding it.
-     */
-    private byte[] encodedBuffer;
-
-    /**
-     * Flag indicating whether the entire content header has been decoded yet.
-     */
-    private boolean decodedFlag = true;
-
-    /**
-     * We have some optimisations for partial decoding for maximum performance. The
-     * headers are used in the broker for routing in some cases so we can decode that
-     * separately.
-     */
-    private boolean decodedHeadersFlag = true;
-
-    /**
-     * We have some optimisations for partial decoding for maximum performance. The
-     * content type is used by all clients to determine the message type.
-     */
-    private boolean decodedContentTypeFlag = true;
-
-    /**
-     * AMQP major and minor version of this instance.
-     */
-     private byte major;
-     private byte minor;
-    
-    /**
-     * Property flags.
-     */
-    ${pch_property_flags_declare}
-
-    // Header fields from specification
-%{FLIST}    ${field_declaration}
-
-    /**
-     * Constructor
-     */
-    public ${CLASS}ContentHeaderProperties(byte major, byte minor)
-    {
-        this.major = major;
-        this.minor = minor;
-        
-        // Although one flag is initialized per property, the flags are used
-        // in ordinal order of the AMQP version represented by this instance,
-        // thus the number of flags actually used may be less than the total
-        // number defined.
-    	${pch_property_flags_initializer}
-    }
-        
-    public int getPropertyListSize()
-    {
-        if (encodedBuffer != null)
-        {
-            return encodedBuffer.length;
-        }
-        else
-        {
-            int size = 0;
-%{FLIST}            ${pch_field_list_size}
-            return size;
-        }
-    }
-
-    private void clearEncodedForm()
-    {
-        if (!decodedFlag && encodedBuffer != null)
-        {
-            //decode();
-        }
-        encodedBuffer = null;
-    }
-
-    public void setPropertyFlags(int[] compactPropertyFlags)
-        throws AMQProtocolVersionException
-    {
-        clearEncodedForm();
-${pch_compact_property_flags_check}
-%{FLIST}            ${pch_set_compact_property_flags}
-    }
-    
-    public int[] getPropertyFlags()
-    {
-    	int[] compactPropertyFlags = new int[] { 0 };
-${pch_compact_property_flags_initializer}
-%{FLIST}            ${pch_get_compact_property_flags}
-        return compactPropertyFlags;
-    }
-
-    public void writePropertyListPayload(ByteBuffer buffer)
-    {
-        if (encodedBuffer != null)
-        {
-            buffer.put(encodedBuffer);
-        }
-        else
-        {
-%{FLIST}            ${pch_field_list_payload}
-        }
-    }
-    
-    public void populatePropertiesFromBuffer(ByteBuffer buffer, int[] propertyFlags, int size)
-        throws AMQFrameDecodingException, AMQProtocolVersionException
-    {
-        setPropertyFlags(propertyFlags);
-
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Property flags: " + propertyFlags);
-        }
-        decode(buffer);
-        /*encodedBuffer = new byte[size];
-        buffer.get(encodedBuffer, 0, size);
-        decodedFlag = false;
-        decodedHeadersFlag = false;
-        decodedContentTypeFlag = false;*/
-    }
-    
-    private void decode(ByteBuffer buffer)
-    {
-        //ByteBuffer buffer = ByteBuffer.wrap(encodedBuffer);
-        int pos = buffer.position();
-        try
-        {
-%{FLIST}            ${pch_field_list_decode}
-	    // This line does nothing, but prevents a compiler error (Exception not thrown)
-            // if this block is empty.
-            if (false) throw new AMQFrameDecodingException("");
-        }
-        catch (AMQFrameDecodingException e)
-        {
-            throw new RuntimeException("Error in content header data: " + e);
-        }
-
-        final int endPos = buffer.position();
-        buffer.position(pos);
-        final int len = endPos - pos;
-        encodedBuffer = new byte[len];
-        final int limit = buffer.limit();
-        buffer.limit(endPos);
-        buffer.get(encodedBuffer, 0, len);
-        buffer.limit(limit);
-        buffer.position(endPos);
-        decodedFlag = true;
-    }
-
-    private void decodeIfNecessary()
-    {
-        if (!decodedFlag)
-        {
-            //decode();
-        }
-    }
-
-    // Field clear methods
-    
-%{FLIST}            ${pch_field_clear_methods}
-
-    // Field get methods
-
-%{FLIST}            ${pch_field_get_methods}
-
-    // Field set methods
-
-%{FLIST}            ${pch_field_set_methods}
-}
diff --git a/cpp/gentools/templ.java/ProtocolVersionListClass.tmpl b/cpp/gentools/templ.java/ProtocolVersionListClass.tmpl
deleted file mode 100644
index bc98e0c1ea..0000000000
--- a/cpp/gentools/templ.java/ProtocolVersionListClass.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-&{ProtocolVersionList.java}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
- 
-package org.apache.qpid.framing;
-
-public interface ProtocolVersionList
-{
-    public final int PROTOCOL_MAJOR = 0;
-    public final int PROTOCOL_MINOR = 1;
-    public final byte pv[][] = {
-%{VLIST} ${protocol-version-list-entry}
-        };
-}
diff --git a/cpp/gentools/xml-src/amqp-0.10.test.xml b/cpp/gentools/xml-src/amqp-0.10.test.xml
deleted file mode 100644
index 5d3d80648b..0000000000
--- a/cpp/gentools/xml-src/amqp-0.10.test.xml
+++ /dev/null
@@ -1,4241 +0,0 @@
-<?xml version = "1.0"?>
-
-<!--
-    EDITORS: (PH)   Pieter Hintjens <ph@imatix.com>
-    (KvdR) Kim van der Riet <kim.vdriet@redhat.com>
-
-    These editors have been assigned by the AMQP working group.
-    Please do not edit/commit this file without consulting with
-    one of the above editors.
-    ========================================================
-
-    TODOs
-        - see TODO comments in the text
--->
-
-<!--
-    Copyright Notice
-    ================
-    (c) Copyright JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc.,
-    iMatix Corporation, IONA\ufffd Technologies, Red Hat, Inc.,
-    TWIST Process Innovations, and 29West Inc. 2006. All rights reserved.
-    
-    License
-    =======
-    JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix 
-    Corporation, IONA\ufffd Technologies, Red Hat, Inc., TWIST Process Innovations, and 
-    29West Inc. (collectively, the "Authors") each hereby grants to you a worldwide,
-    perpetual, royalty-free, nontransferable, nonexclusive license to
-    (i) copy, display, and implement the Advanced Messaging Queue Protocol
-    ("AMQP") Specification and (ii) the Licensed Claims that are held by
-    the Authors, all for the purpose of implementing the Advanced Messaging
-    Queue Protocol Specification. Your license and any rights under this
-    Agreement will terminate immediately without notice from
-    any Author if you bring any claim, suit, demand, or action related to
-    the Advanced Messaging Queue Protocol Specification against any Author.
-    Upon termination, you shall destroy all copies of the Advanced Messaging
-    Queue Protocol Specification in your possession or control.
-
-    As used hereunder, "Licensed Claims" means those claims of a patent or
-    patent application, throughout the world, excluding design patents and
-    design registrations, owned or controlled, or that can be sublicensed
-    without fee and in compliance with the requirements of this
-    Agreement, by an Author or its affiliates now or at any
-    future time and which would necessarily be infringed by implementation
-    of the Advanced Messaging Queue Protocol Specification. A claim is
-    necessarily infringed hereunder only when it is not possible to avoid
-    infringing it because there is no plausible non-infringing alternative
-    for implementing the required portions of the Advanced Messaging Queue
-    Protocol Specification. Notwithstanding the foregoing, Licensed Claims
-    shall not include any claims other than as set forth above even if
-    contained in the same patent as Licensed Claims; or that read solely
-    on any implementations of any portion of the Advanced Messaging Queue
-    Protocol Specification that are not required by the Advanced Messaging
-    Queue Protocol Specification, or that, if licensed, would require a
-    payment of royalties by the licensor to unaffiliated third parties.
-    Moreover, Licensed Claims shall not include (i) any enabling technologies
-    that may be necessary to make or use any Licensed Product but are not
-    themselves expressly set forth in the Advanced Messaging Queue Protocol
-    Specification (e.g., semiconductor manufacturing technology, compiler
-    technology, object oriented technology, networking technology, operating
-    system technology, and the like); or (ii) the implementation of other
-    published standards developed elsewhere and merely referred to in the
-    body of the Advanced Messaging Queue Protocol Specification, or
-    (iii) any Licensed Product and any combinations thereof the purpose or
-    function of which is not required for compliance with the Advanced
-    Messaging Queue Protocol Specification. For purposes of this definition,
-    the Advanced Messaging Queue Protocol Specification shall be deemed to
-    include both architectural and interconnection requirements essential
-    for interoperability and may also include supporting source code artifacts
-    where such architectural, interconnection requirements and source code
-    artifacts are expressly identified as being required or documentation to
-    achieve compliance with the Advanced Messaging Queue Protocol Specification.
-    
-    As used hereunder, "Licensed Products" means only those specific portions
-    of products (hardware, software or combinations thereof) that implement
-    and are compliant with all relevant portions of the Advanced Messaging
-    Queue Protocol Specification.
-    
-    The following disclaimers, which you hereby also acknowledge as to any
-    use you may make of the Advanced Messaging Queue Protocol Specification:
-    
-    THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS,"
-    AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-    IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
-    CONTENTS OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE
-    SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF THE ADVANCED
-    MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD PARTY 
-    PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-    
-    THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-    INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-    USE, IMPLEMENTATION OR DISTRIBUTION OF THE ADVANCED MESSAGING QUEUE
-    PROTOCOL SPECIFICATION.
-    
-    The name and trademarks of the Authors may NOT be used in any manner,
-    including advertising or publicity pertaining to the Advanced Messaging
-    Queue Protocol Specification or its contents without specific, written
-    prior permission. Title to copyright in the Advanced Messaging Queue
-    Protocol Specification will at all times remain with the Authors.
-    
-    No other rights are granted by implication, estoppel or otherwise.
-    
-    Upon termination of your license or rights under this Agreement, you
-    shall destroy all copies of the Advanced Messaging Queue Protocol
-    Specification in your possession or control.
-    
-    Trademarks
-    ==========
-    "JPMorgan", "JPMorgan Chase", "Chase", the JPMorgan Chase logo and the
-    Octagon Symbol are trademarks of JPMorgan Chase & Co.
-    
-    IMATIX and the iMatix logo are trademarks of iMatix Corporation sprl.
-    
-    IONA, IONA Technologies, and the IONA logos are trademarks of IONA
-    Technologies PLC and/or its subsidiaries.
-    
-    LINUX is a trademark of Linus Torvalds. RED HAT and JBOSS are registered
-    trademarks of Red Hat, Inc. in the US and other countries.
-    
-    Java, all Java-based trademarks and OpenOffice.org are trademarks of
-    Sun Microsystems, Inc. in the United States, other countries, or both.
-    
-    Other company, product, or service names may be trademarks or service
-    marks of others.
-    
-    Links to full AMQP specification:
-    =================================
-    http://www.envoytech.org/spec/amq/
-    http://www.iona.com/opensource/amqp/
-    http://www.redhat.com/solutions/specifications/amqp/
-    http://www.twiststandards.org/tiki-index.php?page=AMQ
-    http://www.imatix.com/amqp
--->
-
-<!--
-    <!DOCTYPE amqp SYSTEM "amqp.dtd">
--->
-
-<!-- XML Notes
-
-    We use entities to indicate repetition; attributes to indicate properties.
-
-    We use the 'name' attribute as an identifier, usually within the context
-    of the surrounding entities.
-
-    We use spaces to seperate words in names, so that we can print names in
-    their natural form depending on the context - underlines for source code,
-    hyphens for written text, etc.
-
-    We do not enforce any particular validation mechanism but we support all
-    mechanisms.  The protocol definition conforms to a formal grammar that is
-    published seperately in several technologies.
-
- -->
-
-<amqp major = "0" minor = "10" port = "5672" comment = "AMQ Protocol">
-  <!--
-      ======================================================
-      ==       CONSTANTS
-      ======================================================
-  -->
-  <!-- Frame types -->
-  <constant name = "frame-method"     value = "1" />
-  <constant name = "frame-header"     value = "2" />
-  <constant name = "frame-body"       value = "3" />
-  <constant name = "frame-oob-method" value = "4" />
-  <constant name = "frame-oob-header" value = "5" />
-  <constant name = "frame-oob-body"   value = "6" />
-  <constant name = "frame-trace"      value = "7" />
-  <constant name = "frame-heartbeat"  value = "8" />
-
-  <!-- Protocol constants -->
-  <constant name = "frame-min-size"   value = "4096" />
-  <constant name = "frame-end"        value = "206" />
-
-  <!-- Reply codes -->
-  <constant name = "reply-success" value = "200">
-    <doc>
-      Indicates that the method completed successfully. This reply code is
-      reserved for future use - the current protocol design does not use positive
-      confirmation and reply codes are sent only in case of an error.
-    </doc>
-  </constant>
-
-  <constant name = "not-delivered" value = "310" class = "soft-error">
-    <doc>
-      The client asked for a specific message that is no longer available.
-      The message was delivered to another client, or was purged from the queue
-      for some other reason.
-    </doc>
-  </constant>
-
-  <constant name = "content-too-large" value = "311" class = "soft-error">
-    <doc>
-      The client attempted to transfer content larger than the server could accept
-      at the present time. The client may retry at a later time.
-    </doc>
-  </constant>
-
-  <constant name = "connection-forced" value = "320" class = "hard-error">
-    <doc>
-      An operator intervened to close the connection for some reason. The client
-      may retry at some later date.
-    </doc>
-  </constant>
-
-  <constant name = "invalid-path" value = "402" class = "hard-error">
-    <doc>
-      The client tried to work with an unknown virtual host.
-    </doc>
-  </constant>
-
-  <constant name = "access-refused" value = "403" class = "soft-error">
-    <doc>
-      The client attempted to work with a server entity to which it has no
-      access due to security settings.
-    </doc>
-  </constant>
-
-  <constant name = "not-found" value = "404" class = "soft-error">
-    <doc>The client attempted to work with a server entity that does not exist.</doc>
-  </constant>
-
-  <constant name = "resource-locked" value = "405" class = "soft-error">
-    <doc>
-      The client attempted to work with a server entity to which it has no
-      access because another client is working with it.
-    </doc>
-  </constant>
-
-  <constant name = "precondition-failed" value = "406" class = "soft-error">
-    <doc>
-      The client requested a method that was not allowed because some precondition
-      failed.
-    </doc>
-  </constant>
-
-  <constant name = "frame-error" value = "501" class = "hard-error">
-    <doc>
-      The client sent a malformed frame that the server could not decode. This
-      strongly implies a programming error in the client.
-    </doc>
-  </constant>
-
-  <constant name = "syntax-error" value = "502" class = "hard-error">
-    <doc>
-      The client sent a frame that contained illegal values for one or more
-      fields. This strongly implies a programming error in the client.
-    </doc>
-  </constant>
-
-  <constant name = "command-invalid" value = "503" class = "hard-error">
-    <doc>
-      The client sent an invalid sequence of frames, attempting to perform an
-      operation that was considered invalid by the server. This usually implies
-      a programming error in the client.
-    </doc>
-  </constant>
-
-  <constant name = "channel-error" value = "504" class = "hard-error">
-    <doc>
-      The client attempted to work with a channel that had not been correctly
-      opened. This most likely indicates a fault in the client layer.
-    </doc>
-  </constant>
-
-  <constant name = "resource-error" value = "506" class = "hard-error">
-    <doc>
-      The server could not complete the method because it lacked sufficient
-      resources. This may be due to the client creating too many of some type
-      of entity.
-    </doc>
-  </constant>
-
-  <constant name = "not-allowed" value = "530" class = "hard-error">
-    <doc>
-      The client tried to work with some entity in a manner that is prohibited
-      by the server, due to security settings or by some other criteria.
-    </doc>
-  </constant>
-
-  <constant name = "not-implemented" value = "540" class = "hard-error">
-    <doc>
-      The client tried to use functionality that is not implemented in the
-      server.
-    </doc>
-  </constant>
-
-  <constant name = "internal-error" value = "545" class = "hard-error">
-    <doc>
-      The server could not complete the method because of an internal error.
-      The server may require intervention by an operator in order to resume
-      normal operations.
-    </doc>
-  </constant>
-
-  <constant name = "test-double" value = "3.141592654"/>
-  <constant name = "test-str1" value = "hello, world!"/>
-  <constant name = "test-str2" value = "1.2.3.4"/>
-
-  <!--
-      ======================================================
-      ==       DOMAIN TYPES
-      ======================================================
-  -->
-
-  <domain name = "access-ticket" type = "short" label = "access ticket granted by server">
-    <doc>
-      An access ticket granted by the server for a certain set of access rights
-      within a specific realm. Access tickets are valid within the channel where
-      they were created, and expire when the channel closes.
-    </doc>
-    <assert check = "ne" value = "0" />
-  </domain>
-
-  <domain name = "class-id" type = "short" />
-
-  <domain name = "consumer-tag" type = "shortstr" label = "consumer tag">
-    <doc>
-      Identifier for the consumer, valid within the current connection.
-    </doc>
-  </domain>
-
-  <domain name = "delivery-tag" type = "longlong" label = "server-assigned delivery tag">
-    <doc>
-      The server-assigned and channel-specific delivery tag
-    </doc>
-    <rule name = "channel-local">
-      <doc>
-        The delivery tag is valid only within the channel from which the message was
-        received. I.e. a client MUST NOT receive a message on one channel and then
-        acknowledge it on another.
-      </doc>
-    </rule>
-    <rule name = "non-zero">
-      <doc>
-        The server MUST NOT use a zero value for delivery tags. Zero is reserved
-        for client use, meaning "all messages so far received".
-      </doc>
-    </rule>
-  </domain>
-
-  <domain name = "exchange-name" type = "shortstr" label = "exchange name">
-    <doc>
-      The exchange name is a client-selected string that identifies the exchange for publish
-      methods. Exchange names may consist of any mixture of digits, letters, and underscores.
-      Exchange names are scoped by the virtual host.
-    </doc>
-    <assert check = "length" value = "127" />
-  </domain>
-
-  <domain name = "known-hosts" type = "shortstr" label = "list of known hosts">
-    <doc>
-      Specifies the list of equivalent or alternative hosts that the server knows about,
-      which will normally include the current server itself. Clients can cache this
-      information and use it when reconnecting to a server after a failure.  This field
-      may be empty.
-    </doc>
-  </domain>
-
-  <domain name = "method-id" type = "long" />
-
-  <domain name = "no-ack" type = "bit" label = "no acknowledgement needed">
-    <doc>
-      If this field is set the server does not expect acknowledgments for
-      messages. That is, when a message is delivered to the client the server
-      automatically and silently acknowledges it on behalf of the client. This
-      functionality increases performance but at the cost of reliability.
-      Messages can get lost if a client dies before it can deliver them to the
-      application.
-    </doc>
-  </domain>
-
-  <domain name = "no-local" type = "bit" label = "do not deliver own messages">
-    <doc>
-      If the no-local field is set the server will not send messages to the client that
-      published them.
-    </doc>
-  </domain>
-
-  <domain name = "path" type = "shortstr">
-    <doc>
-      Must start with a slash "/" and continue with path names separated by slashes. A path
-      name consists of any combination of at least one of [A-Za-z0-9] plus zero or more of
-      [.-_+!=:].
-    </doc>
-
-    <assert check = "notnull" />
-    <assert check = "syntax" rule = "path" />
-    <assert check = "length" value = "127" />
-  </domain>
-
-  <domain name = "peer-properties" type = "table">
-    <doc>
-      This string provides a set of peer properties, used for identification, debugging, and
-      general information.
-    </doc>
-  </domain>
-
-  <domain name = "queue-name" type = "shortstr" label = "queue name">
-    <doc>
-      The queue name identifies the queue within the vhost. Queue names may consist of any
-      mixture of digits, letters, and underscores.
-    </doc>
-    <assert check = "length" value = "127" />
-  </domain>
-
-  <domain name = "redelivered" type = "bit" label = "message is being redelivered">
-    <doc>
-      This indicates that the message has been previously delivered to this or
-      another client.
-    </doc>
-    <rule name = "implementation">
-      <doc>
-        The server SHOULD try to signal redelivered messages when it can. When
-        redelivering a message that was not successfully acknowledged, the server
-        SHOULD deliver it to the original client if possible.
-      </doc>
-      <doc type = "scenario">
-        Create a shared queue and publish a message to the queue.  Consume the
-        message using explicit acknowledgements, but do not acknowledge the
-        message.  Close the connection, reconnect, and consume from the queue
-        again.  The message should arrive with the redelivered flag set.
-      </doc>
-    </rule>
-    <rule name = "hinting">
-      <doc>
-        The client MUST NOT rely on the redelivered field but should take it as a
-        hint that the message may already have been processed. A fully robust
-        client must be able to track duplicate received messages on non-transacted,
-        and locally-transacted channels.
-      </doc>
-    </rule>
-  </domain>
-
-  <domain name = "reply-code" type = "short" label = "reply code from server">
-    <doc>
-      The reply code. The AMQ reply codes are defined as constants at the start
-      of this formal specification.
-    </doc>
-    <assert check = "notnull" />
-  </domain>
-
-  <domain name = "reply-text" type = "shortstr" label = "localised reply text">
-    <doc>
-      The localised reply text. This text can be logged as an aid to resolving
-      issues.
-    </doc>
-    <assert check = "notnull" />
-  </domain>
-
-  <!-- Elementary domains -->
-  <domain name = "bit"        type = "bit"       label = "single bit" />
-  <domain name = "octet"      type = "octet"     label = "single octet" />
-  <domain name = "short"      type = "short"     label = "16-bit integer" />
-  <domain name = "long"       type = "long"      label = "32-bit integer" />
-  <domain name = "longlong"   type = "longlong"  label = "64-bit integer" />
-  <domain name = "shortstr"   type = "shortstr"  label = "short string" />
-  <domain name = "longstr"    type = "longstr"   label = "long string" />
-  <domain name = "timestamp"  type = "timestamp" label = "64-bit timestamp" />
-  <domain name = "table"      type = "table"     label = "field table" />
-
-  <!-- ==  CONNECTION  ======================================================= -->
-
-  <!-- TODO 0.81 - the 'handler' attribute of methods needs to be reviewed, and if
-       no current implementations use it, removed. /PH 2006/07/20
-       -->
-
-  <class name = "connection" handler = "connection" index = "10" label = "work with socket connections">
-    <doc>
-      The connection class provides methods for a client to establish a network connection to
-      a server, and for both peers to operate the connection thereafter.
-    </doc>
-
-    <doc type = "grammar">
-      connection          = open-connection *use-connection close-connection
-      open-connection     = C:protocol-header
-                            S:START C:START-OK
-                            *challenge
-                            S:TUNE C:TUNE-OK
-                            C:OPEN S:OPEN-OK | S:REDIRECT
-      challenge           = S:SECURE C:SECURE-OK
-      use-connection      = *channel
-      close-connection    = C:CLOSE S:CLOSE-OK
-                          / S:CLOSE C:CLOSE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "start" synchronous = "1" index = "10" label = "start connection negotiation">
-      <doc>
-        This method starts the connection negotiation process by telling the client the
-        protocol version that the server proposes, along with a list of security mechanisms
-        which the client can use for authentication.
-      </doc>
-
-      <rule name = "protocol-name">
-        <doc>
-          If the server cannot support the protocol specified in the protocol header,
-          it MUST close the socket connection without sending any response method.
-        </doc>
-        <doc type = "scenario">
-          The client sends a protocol header containing an invalid protocol name.
-          The server must respond by closing the connection.
-        </doc>
-      </rule>
-      <rule name = "server-support">
-        <doc>
-          The server MUST provide a protocol version that is lower than or equal to
-          that requested by the client in the protocol header.
-        </doc>
-        <doc type = "scenario">
-          The client requests a protocol version that is higher than any valid
-          implementation, e.g. 9.0.  The server must respond with a current
-          protocol version, e.g. 1.0.
-        </doc>
-      </rule>
-      <rule name = "client-support">
-        <doc>
-          If the client cannot handle the protocol version suggested by the server
-          it MUST close the socket connection.
-        </doc>
-        <doc type = "scenario">
-          The server sends a protocol version that is lower than any valid
-          implementation, e.g. 0.1.  The client must respond by closing the
-          connection.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-      <response name = "start-ok" />
-
-      <field name = "version-major" domain = "octet" label = "protocol major version">
-        <doc>
-          The version of the protocol, expressed in protocol units of 0.1 public
-          versions and properly printed as two digits with a leading zero. I.e. a
-          protocol version of "09" represents a public version "0.9".  The decimal
-          shift allows the correct expression of pre-1.0 protocol releases.
-        </doc>
-        <doc type = "todo">
-          This field should be renamed to "protocol version".
-        </doc>
-      </field>
-
-      <field name = "version-minor" domain = "octet" label = "protocol major version">
-        <doc>
-          The protocol revision, expressed as an integer from 0 to 9.  The use of more
-          than ten revisions is discouraged.  The public version string is constructed
-          from the protocol version and revision as follows: we print the protocol
-          version with one decimal position, and we append the protocol revision. A
-          version=10 and revision=2 are printed as "1.02".
-        </doc>
-        <doc type = "todo">
-          This field should be renamed to "protocol revision".
-        </doc>
-      </field>
-
-      <field name = "server-properties" domain = "peer-properties" label = "server properties">
-        <rule name = "required-fields">
-          <doc>
-            The properties SHOULD contain at least these fields: "host", specifying the
-            server host name or address, "product", giving the name of the server product,
-            "version", giving the name of the server version, "platform", giving the name
-            of the operating system, "copyright", if appropriate, and "information", giving
-            other general information.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and inspects the server properties. It checks for
-            the presence of the required fields.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "mechanisms" domain = "longstr" label = "available security mechanisms">
-        <doc>
-          A list of the security mechanisms that the server supports, delimited by spaces.
-          Currently ASL supports these mechanisms: PLAIN.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "locales" domain = "longstr" label = "available message locales">
-        <doc>
-          A list of the message locales that the server supports, delimited by spaces. The
-          locale defines the language in which the server will send reply texts.
-        </doc>
-        <rule name = "required-support">
-          <doc>
-            The server MUST support at least the en_US locale.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and inspects the locales field. It checks for
-            the presence of the required locale(s).
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <method name = "start-ok" synchronous = "1" index = "11"
-      label = "select security mechanism and locale">
-      <doc>
-        This method selects a SASL security mechanism. ASL uses SASL (RFC2222) to
-        negotiate authentication and encryption.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "client-properties" domain = "peer-properties" label = "client properties">
-        <rule name = "required-fields">
-          <!-- This rule is not testable from the client side -->
-          <doc>
-            The properties SHOULD contain at least these fields: "product", giving the name
-            of the client product, "version", giving the name of the client version, "platform",
-            giving the name of the operating system, "copyright", if appropriate, and
-            "information", giving other general information.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "mechanism" domain = "shortstr" label = "selected security mechanism">
-        <doc>
-          A single security mechanisms selected by the client, which must be one of those
-          specified by the server.
-        </doc>
-        <rule name = "security">
-          <doc>
-            The client SHOULD authenticate using the highest-level security profile it
-            can handle from the list provided by the server.
-          </doc>
-        </rule>
-        <rule name = "validity">
-          <doc>
-            If the mechanism field does not contain one of the security mechanisms
-            proposed by the server in the Start method, the server MUST close the
-            connection without sending any further data.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and sends an invalid security mechanism. The
-            server must respond by closing the connection (a socket close, with no
-            connection close negotiation).
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "response" domain = "longstr" label = "security response data">
-        <doc>
-          A block of opaque data passed to the security mechanism. The contents of this
-          data are defined by the SASL security mechanism.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "locale" domain = "shortstr" label = "selected message locale">
-        <doc>
-          A single message local selected by the client, which must be one of those
-          specified by the server.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "secure" synchronous = "1" index = "20" label = "security mechanism challenge">
-      <doc>
-        The SASL protocol works by exchanging challenges and responses until both peers have
-        received sufficient information to authenticate each other. This method challenges
-        the client to provide more information.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-      <response name = "secure-ok" />
-
-      <field name = "challenge" domain = "longstr" label = "security challenge data">
-        <doc>
-          Challenge information, a block of opaque binary data passed to the security
-          mechanism.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "secure-ok" synchronous = "1" index = "21" label = "security mechanism response">
-      <doc>
-        This method attempts to authenticate, passing a block of SASL data for the security
-        mechanism at the server side.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "response" domain = "longstr" label = "security response data">
-        <doc>
-          A block of opaque data passed to the security mechanism. The contents of this
-          data are defined by the SASL security mechanism.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "tune" synchronous = "1" index = "30"
-      label = "propose connection tuning parameters">
-      <doc>
-        This method proposes a set of connection configuration values to the client. The
-        client can accept and/or adjust these.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <response name = "tune-ok" />
-
-      <field name = "channel-max" domain = "short" label = "proposed maximum channels">
-        <doc>
-          The maximum total number of channels that the server allows per connection. Zero
-          means that the server does not impose a fixed limit, but the number of allowed
-          channels may be limited by available server resources.
-        </doc>
-      </field>
-
-      <field name = "frame-max" domain = "long" label = "proposed maximum frame size">
-        <doc>
-          The largest frame size that the server proposes for the connection. The client
-          can negotiate a lower value. Zero means that the server does not impose any
-          specific limit but may reject very large frames if it cannot allocate resources
-          for them.
-        </doc>
-        <rule name = "minimum">
-          <doc>
-            Until the frame-max has been negotiated, both peers MUST accept frames of up
-            to frame-min-size octets large, and the minimum negotiated value for frame-max
-            is also frame-min-size.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and sends a large properties field, creating a frame
-            of frame-min-size octets.  The server must accept this frame.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "heartbeat" domain = "short" label = "desired heartbeat delay">
-        <!-- TODO 0.82 - the heartbeat negotiation mechanism was changed during
-             implementation because the model documented here does not actually
-             work properly.  The best model we found is that the server proposes
-             a heartbeat value to the client; the client can reply with zero, meaning
-             'do not use heartbeats (as documented here), or can propose its own
-             heartbeat value, which the server should then accept.  This is different
-             from the model here which is disconnected - e.g. each side requests a
-             heartbeat independently.  Basically a connection is heartbeated in
-             both ways, or not at all, depending on whether both peers support
-             heartbeating or not, and the heartbeat value should itself be chosen
-             by the client so that remote links can get a higher value.  Also, the
-             actual heartbeat mechanism needs documentation, and is as follows: so
-             long as there is activity on a connection - in or out - both peers
-             assume the connection is active.  When there is no activity, each peer
-             must send heartbeat frames.  When no heartbeat frame is received after
-             N cycles (where N is at least 2), the connection can be considered to
-             have died. /PH 2006/07/19
-             -->
-        <doc>
-          The delay, in seconds, of the connection heartbeat that the server wants.
-          Zero means the server does not want a heartbeat.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "tune-ok" synchronous = "1" index = "31"
-      label = "negotiate connection tuning parameters">
-      <doc>
-        This method sends the client's connection tuning parameters to the server.
-        Certain fields are negotiated, others provide capability information.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "channel-max" domain = "short" label = "negotiated maximum channels">
-        <doc>
-          The maximum total number of channels that the client will use per connection.
-        </doc>
-        <rule name = "upper-limit">
-          <doc>
-            If the client specifies a channel max that is higher than the value provided
-            by the server, the server MUST close the connection without attempting a
-            negotiated close.  The server may report the error in some fashion to assist
-            implementors.
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-        <assert check = "le" method = "tune" field = "channel-max" />
-      </field>
-
-      <field name = "frame-max" domain = "long" label = "negotiated maximum frame size">
-        <doc>
-          The largest frame size that the client and server will use for the connection.
-          Zero means that the client does not impose any specific limit but may reject
-          very large frames if it cannot allocate resources for them. Note that the
-          frame-max limit applies principally to content frames, where large contents can
-          be broken into frames of arbitrary size.
-        </doc>
-        <rule name = "minimum">
-          <doc>
-            Until the frame-max has been negotiated, both peers MUST accept frames of up
-            to frame-min-size octets large, and the minimum negotiated value for frame-max
-            is also frame-min-size.
-          </doc>
-        </rule>
-        <rule name = "upper-limit">
-          <doc>
-            If the client specifies a frame max that is higher than the value provided
-            by the server, the server MUST close the connection without attempting a
-            negotiated close. The server may report the error in some fashion to assist
-            implementors.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "heartbeat" domain = "short" label = "desired heartbeat delay">
-        <doc>
-          The delay, in seconds, of the connection heartbeat that the client wants. Zero
-          means the client does not want a heartbeat.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "open" synchronous = "1" index = "40" label = "open connection to virtual host">
-      <doc>
-        This method opens a connection to a virtual host, which is a collection of
-        resources, and acts to separate multiple application domains within a server.
-        The server may apply arbitrary limits per virtual host, such as the number
-        of each type of entity that may be used, per connection and/or in total.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "open-ok" />
-      <response name = "redirect" />
-
-      <field name = "virtual-host" domain = "path" label = "virtual host name">
-        <!-- TODO 0.82 - the entire vhost model needs review. This concept was
-             prompted by the HTTP vhost concept but does not fit very well into
-             AMQP.  Currently we use the vhost as a "cluster identifier" which is
-             inaccurate usage. /PH 2006/07/19
-             -->
-        <assert check = "regexp" value = "^[a-zA-Z0-9/-_]+$" />
-        <doc>
-          The name of the virtual host to work with.
-        </doc>
-        <rule name = "separation">
-          <doc>
-            If the server supports multiple virtual hosts, it MUST enforce a full
-            separation of exchanges, queues, and all associated entities per virtual
-            host. An application, connected to a specific virtual host, MUST NOT be able
-            to access resources of another virtual host.
-          </doc>
-        </rule>
-        <rule name = "security">
-          <doc>
-            The server SHOULD verify that the client has permission to access the
-            specified virtual host.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "capabilities" domain = "shortstr" label = "required capabilities">
-        <doc>
-          The client can specify zero or more capability names, delimited by spaces.
-          The server can use this string to how to process the client's connection
-          request.
-        </doc>
-      </field>
-
-      <field name = "insist" domain = "bit" label = "insist on connecting to server">
-        <doc>
-          In a configuration with multiple collaborating servers, the server may respond
-          to a Connection.Open method with a Connection.Redirect. The insist option tells
-          the server that the client is insisting on a connection to the specified server.
-        </doc>
-        <rule name = "behaviour">
-          <doc>
-            When the client uses the insist option, the server MUST NOT respond with a
-            Connection.Redirect method.  If it cannot accept the client's connection
-            request it should respond by closing the connection with a suitable reply
-            code.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "open-ok" synchronous = "1" index = "41" label = "signal that connection is ready">
-      <doc>
-        This method signals to the client that the connection is ready for use.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "known-hosts" domain = "known-hosts" />
-    </method>
-
-    <method name = "redirect" synchronous = "1" index = "42" label = "redirects client to other server">
-      <doc>
-        This method redirects the client to another server, based on the requested virtual
-        host and/or capabilities.
-      </doc>
-      <rule name = "usage">
-        <doc>
-          When getting the Connection.Redirect method, the client SHOULD reconnect to
-          the host specified, and if that host is not present, to any of the hosts
-          specified in the known-hosts list.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "host" domain = "shortstr" label = "server to connect to">
-        <doc>
-          Specifies the server to connect to. This is an IP address or a DNS name,
-          optionally followed by a colon and a port number. If no port number is
-          specified, the client should use the default port number for the protocol.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-      <field name = "known-hosts" domain = "known-hosts" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "close" synchronous = "1" index = "50" label = "request a connection close">
-      <doc>
-        This method indicates that the sender wants to close the connection. This may be
-        due to internal conditions (e.g. a forced shut-down) or due to an error handling
-        a specific method, i.e. an exception. When a close is due to an exception, the
-        sender provides the class and method id of the method which caused the exception.
-      </doc>
-      <!-- TODO: the connection close mechanism needs to be reviewed from the ODF
-           documentation and better expressed as rules here. /PH 2006/07/20
-           -->
-      <rule name = "stability">
-        <doc>
-          After sending this method any received method except the Close-OK method MUST
-          be discarded.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-      <response name = "close-ok" />
-
-      <field name = "reply-code" domain = "reply-code" />
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "class-id" domain = "class-id" label = "failing method class">
-        <doc>
-          When the close is provoked by a method exception, this is the class of the
-          method.
-        </doc>
-      </field>
-
-      <field name = "method-id" domain = "method-id" label = "failing method ID">
-        <doc>
-          When the close is provoked by a method exception, this is the ID of the method.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "close-ok" synchronous = "1" index = "51" label = "confirm a connection close">
-      <doc>
-        This method confirms a Connection.Close method and tells the recipient that it is
-        safe to release resources for the connection and close the socket.
-      </doc>
-      <rule name = "reporting">
-        <doc>
-          A peer that detects a socket closure without having received a Close-Ok
-          handshake method SHOULD log the error.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  CHANNEL  ========================================================== -->
-
-  <class name = "channel" handler = "channel" index = "20" label = "work with channels">
-    <doc>
-      The channel class provides methods for a client to establish a channel to a
-      server and for both peers to operate the channel thereafter.
-    </doc>
-
-    <doc type = "grammar">
-      channel             = open-channel *use-channel close-channel
-      open-channel        = C:OPEN S:OPEN-OK
-      use-channel         = C:FLOW S:FLOW-OK
-                          / S:FLOW C:FLOW-OK
-                          / S:ALERT
-                          / functional-class
-      close-channel       = C:CLOSE S:CLOSE-OK
-                          / S:CLOSE C:CLOSE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "open" synchronous = "1" index = "10" label = "open a channel for use">
-      <doc>
-        This method opens a channel to the server.
-      </doc>
-      <rule name = "state" on-failure = "channel-error">
-        <doc>
-          The client MUST NOT use this method on an alread-opened channel.
-        </doc>
-        <doc type = "scenario">
-          Client opens a channel and then reopens the same channel.
-        </doc>
-      </rule>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "open-ok" />
-      <field name = "out of band" domain = "shortstr" label = "out-of-band settings">
-        <doc>
-          Configures out-of-band transfers on this channel. The syntax and meaning of this
-          field will be formally defined at a later date.
-        </doc>
-        <assert check = "null" />
-      </field>
-    </method>
-
-    <method name = "open-ok" synchronous = "1" index = "11" label = "signal that the channel is ready">
-      <doc>
-        This method signals to the client that the channel is ready for use.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "flow" synchronous = "1" index = "20" label = "enable/disable flow from peer">
-      <doc>
-        This method asks the peer to pause or restart the flow of content data. This is a
-        simple flow-control mechanism that a peer can use to avoid oveflowing its queues or
-        otherwise finding itself receiving more messages than it can process. Note that this
-        method is not intended for window control. The peer that receives a disable flow
-        method should finish sending the current content frame, if any, then pause.
-      </doc>
-
-      <rule name = "initial-state">
-        <doc>
-          When a new channel is opened, it is active (flow is active). Some applications
-          assume that channels are inactive until started. To emulate this behaviour a
-          client MAY open the channel, then pause it.
-        </doc>
-      </rule>
-
-      <rule name = "bidirectional">
-        <doc>
-          When sending content frames, a peer SHOULD monitor the channel for incoming
-          methods and respond to a Channel.Flow as rapidly as possible.
-        </doc>
-      </rule>
-
-      <rule name = "throttling">
-        <doc>
-          A peer MAY use the Channel.Flow method to throttle incoming content data for
-          internal reasons, for example, when exchanging data over a slower connection.
-        </doc>
-      </rule>
-
-      <rule name = "expected-behaviour">
-        <doc>
-          The peer that requests a Channel.Flow method MAY disconnect and/or ban a peer
-          that does not respect the request.  This is to prevent badly-behaved clients
-          from overwhelming a broker.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-
-      <response name = "flow-ok" />
-
-      <field name = "active" domain = "bit" label = "start/stop content frames">
-        <doc>
-          If 1, the peer starts sending content frames. If 0, the peer stops sending
-          content frames.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "flow-ok" index = "21" label = "confirm a flow method">
-      <doc>
-        Confirms to the peer that a flow command was received and processed.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-      <field name = "active" domain = "bit" label = "current flow setting">
-        <doc>
-          Confirms the setting of the processed flow method: 1 means the peer will start
-          sending or continue to send content frames; 0 means it will not.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- TODO 0.82 - remove this method entirely
-        /PH 2006/07/20
-        -->
-    <method name = "alert" index = "30" label = "send a non-fatal warning message">
-      <doc>
-        This method allows the server to send a non-fatal warning to the client. This is
-        used for methods that are normally asynchronous and thus do not have confirmations,
-        and for which the server may detect errors that need to be reported. Fatal errors
-        are handled as channel or connection exceptions; non-fatal errors are sent through
-        this method.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "reply-code" domain = "reply-code" />
-      <field name = "reply-text" domain = "reply-text" />
-      <field name = "details" domain = "table" label = "detailed information for warning">
-        <doc>
-          A set of fields that provide more information about the problem. The meaning of
-          these fields are defined on a per-reply-code basis (TO BE DEFINED).
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "close" synchronous = "1" index = "40" label = "request a channel close">
-      <doc>
-        This method indicates that the sender wants to close the channel. This may be due to
-        internal conditions (e.g. a forced shut-down) or due to an error handling a specific
-        method, i.e. an exception. When a close is due to an exception, the sender provides
-        the class and method id of the method which caused the exception.
-      </doc>
-
-      <!-- TODO: the channel close behaviour needs to be reviewed from the ODF
-           documentation and better expressed as rules here. /PH 2006/07/20
-           -->
-      <rule name = "stability">
-        <doc>
-          After sending this method any received method except the Close-OK method MUST
-          be discarded.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-      <response name = "close-ok" />
-
-      <field name = "reply-code" domain = "reply-code" />
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "class-id" domain = "class-id" label = "failing method class">
-        <doc>
-          When the close is provoked by a method exception, this is the class of the
-          method.
-        </doc>
-      </field>
-
-      <field name = "method-id" domain = "method-id" label = "failing method ID">
-        <doc>
-          When the close is provoked by a method exception, this is the ID of the method.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "close-ok" synchronous = "1" index = "41" label = "confirm a channel close">
-      <doc>
-        This method confirms a Channel.Close method and tells the recipient that it is safe
-        to release resources for the channel and close the socket.
-      </doc>
-      <rule name = "reporting">
-        <doc>
-          A peer that detects a socket closure without having received a Channel.Close-Ok
-          handshake method SHOULD log the error.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  ACCESS  =========================================================== -->
-
-  <!-- TODO 0.82 - this class must be implemented by two teams before we can
-       consider it matured.
-    -->
-
-  <class name = "access" handler = "connection" index = "30" label = "work with access tickets">
-    <doc>
-      The protocol control access to server resources using access tickets. A
-      client must explicitly request access tickets before doing work. An access
-      ticket grants a client the right to use a specific set of resources -
-      called a "realm" - in specific ways.
-    </doc>
-
-    <doc type = "grammar">
-      access              = C:REQUEST S:REQUEST-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "request" synchronous = "1" index = "10" label = "request an access ticket">
-      <doc>
-        This method requests an access ticket for an access realm. The server
-        responds by granting the access ticket. If the client does not have
-        access rights to the requested realm this causes a connection exception.
-        Access tickets are a per-channel resource.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "request-ok" />
-
-      <field name = "realm" domain = "shortstr" label = "name of requested realm">
-        <doc>
-          Specifies the name of the realm to which the client is requesting access.
-          The realm is a configured server-side object that collects a set of
-          resources (exchanges, queues, etc.).  If the channel has already requested
-          an access ticket onto this realm, the previous ticket is destroyed and a
-          new ticket is created with the requested access rights, if allowed.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST specify a realm that is known to the server.  The server
-            makes an identical response for undefined realms as it does for realms
-            that are defined but inaccessible to this client.
-          </doc>
-          <doc type = "scenario">
-            Client specifies an undefined realm.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive access to the realm, meaning that this will be the only
-          channel that uses the realm's resources.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MAY NOT request exclusive access to a realm that has active
-            access tickets, unless the same channel already had the only access
-            ticket onto that realm.
-          </doc>
-          <doc type = "scenario">
-            Client opens two channels and requests exclusive access to the same realm.
-          </doc>
-        </rule>
-      </field>
-      <field name = "passive" domain = "bit" label = "request passive access">
-        <doc>
-          Request message passive access to the specified access realm. Passive
-          access lets a client get information about resources in the realm but
-          not to make any changes to them.
-        </doc>
-      </field>
-      <field name = "active" domain = "bit" label = "request active access">
-        <doc>
-          Request message active access to the specified access realm. Active access lets
-          a client get create and delete resources in the realm.
-        </doc>
-      </field>
-      <field name = "write" domain = "bit" label = "request write access">
-        <doc>
-          Request write access to the specified access realm. Write access lets a client
-          publish messages to all exchanges in the realm.
-        </doc>
-      </field>
-      <field name = "read" domain = "bit" label = "request read access">
-        <doc>
-          Request read access to the specified access realm. Read access lets a client
-          consume messages from queues in the realm.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "request-ok" synchronous = "1" index = "11" label = "grant access to server resources">
-      <doc>
-        This method provides the client with an access ticket. The access ticket is valid
-        within the current channel and for the lifespan of the channel.
-      </doc>
-      <rule name = "per-channel" on-failure = "not-allowed">
-        <doc>
-          The client MUST NOT use access tickets except within the same channel as
-          originally granted.
-        </doc>
-        <doc type = "scenario">
-          Client opens two channels, requests a ticket on one channel, and then
-          tries to use that ticket in a seconc channel.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "ticket" domain = "access-ticket" />
-    </method>
-  </class>
-
-  <!-- ==  EXCHANGE  ========================================================= -->
-
-  <class name = "exchange" handler = "channel" index = "40" label = "work with exchanges">
-    <doc>
-      Exchanges match and distribute messages across queues. Exchanges can be configured in
-      the server or created at runtime.
-    </doc>
-
-    <doc type = "grammar">
-      exchange            = C:DECLARE  S:DECLARE-OK
-                          / C:DELETE   S:DELETE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <rule name = "required-types">
-      <doc>
-        The server MUST implement these standard exchange types: fanout, direct.
-      </doc>
-      <doc type = "scenario">
-        Client attempts to declare an exchange with each of these standard types.
-      </doc>
-    </rule>
-    <rule name = "recommended-types">
-      <doc>
-        The server SHOULD implement these standard exchange types: topic, headers.
-      </doc>
-      <doc type = "scenario">
-        Client attempts to declare an exchange with each of these standard types.
-      </doc>
-    </rule>
-    <rule name = "required-instances">
-      <doc>
-        The server MUST, in each virtual host, pre-declare an exchange instance
-        for each standard exchange type that it implements, where the name of the
-        exchange instance is "amq." followed by the exchange type name.
-      </doc>
-      <doc type = "scenario">
-        Client creates a temporary queue and attempts to bind to each required
-        exchange instance (amq.fanout, amq.direct, and amq.topic, amq.headers if
-        those types are defined).
-      </doc>
-    </rule>
-    <rule name = "default-exchange">
-      <doc>
-        The server MUST predeclare a direct exchange to act as the default exchange
-        for content Publish methods and for default queue bindings.
-      </doc>
-      <doc type = "scenario">
-        Client checks that the default exchange is active by specifying a queue
-        binding with no exchange name, and publishing a message with a suitable
-        routing key but without specifying the exchange name, then ensuring that
-        the message arrives in the queue correctly.
-      </doc>
-    </rule>
-    <rule name = "default-access">
-      <doc>
-        The server MUST NOT allow clients to access the default exchange except
-        by specifying an empty exchange name in the Queue.Bind and content Publish
-        methods.
-      </doc>
-    </rule>
-    <rule name = "extensions">
-      <doc>
-        The server MAY implement other exchange types as wanted.
-      </doc>
-    </rule>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "declare" synchronous = "1" index = "10" label = "declare exchange, create if needed">
-      <doc>
-        This method creates an exchange if it does not already exist, and if the exchange
-        exists, verifies that it is of the correct and expected class.
-      </doc>
-      <rule name = "minimum">
-        <doc>
-          The server SHOULD support a minimum of 16 exchanges per virtual host and
-          ideally, impose no limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          The client creates as many exchanges as it can until the server reports
-          an error; the number of exchanges successfuly created must be at least
-          sixteen.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "declare-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          When a client defines a new exchange, this belongs to the access realm of the
-          ticket used. All further work done with that exchange must be done with an
-          access ticket for the same realm.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "active" access to
-            the realm in which the exchange exists or will be created, or "passive"
-            access if the if-exists flag is set.
-          </doc>
-          <doc type = "scenario">
-            Client creates access ticket with wrong access rights and attempts to use
-            in this method.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <rule name = "reserved" on-failure = "access-refused">
-          <doc>
-            Exchange names starting with "amq." are reserved for predeclared and
-            standardised exchanges. The client MUST NOT attempt to create an exchange
-            starting with "amq.".
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <assert check = "regexp" value = "^[a-zA-Z0-9-_.:]+$" />
-      </field>
-
-      <field name = "type" domain = "shortstr" label = "exchange type">
-        <doc>
-          Each exchange belongs to one of a set of exchange types implemented by the
-          server. The exchange types define the functionality of the exchange - i.e. how
-          messages are routed through it. It is not valid or meaningful to attempt to
-          change the type of an existing exchange.
-        </doc>
-        <rule name = "typed" on-failure = "not-allowed">
-          <doc>
-            Exchanges cannot be redeclared with different types.  The client MUST not
-            attempt to redeclare an existing exchange with a different type than used
-            in the original Exchange.Declare method.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <rule name = "support" on-failure = "command-invalid">
-          <doc>
-            The client MUST NOT attempt to create an exchange with a type that the
-            server does not support.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <assert check = "regexp" value = "^[a-zA-Z0-9-_.:]+$" />
-      </field>
-
-      <field name = "passive" domain = "bit" label = "do not create exchange">
-        <doc>
-          If set, the server will not create the exchange. The client can use this to
-          check whether an exchange exists without modifying the server state.
-        </doc>
-        <rule name = "not-found">
-          <doc>
-            If set, and the exchange does not already exist, the server MUST raise a
-            channel exception with reply code 404 (not found).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "durable" domain = "bit" label = "request a durable exchange">
-        <doc>
-          If set when creating a new exchange, the exchange will be marked as durable.
-          Durable exchanges remain active when a server restarts. Non-durable exchanges
-          (transient exchanges) are purged if/when a server restarts.
-        </doc>
-        <rule name = "support">
-          <doc>
-            The server MUST support both durable and transient exchanges.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <rule name = "sticky">
-          <doc>
-            The server MUST ignore the durable field if the exchange already exists.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <!-- TODO 0.82 - clarify how this works; there is no way to cancel a binding
-           except by deleting a queue.
-         -->
-      <field name = "auto-delete" domain = "bit" label = "auto-delete when unused">
-        <doc>
-          If set, the exchange is deleted when all queues have finished using it.
-        </doc>
-        <rule name = "sticky">
-          <doc>
-            The server MUST ignore the auto-delete field if the exchange already
-            exists.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "internal" domain = "bit" label = "create internal exchange">
-        <doc>
-          If set, the exchange may not be used directly by publishers, but only when bound
-          to other exchanges. Internal exchanges are used to construct wiring that is not
-          visible to applications.
-        </doc>
-      </field>
-
-      <field name = "arguments" domain = "table" label = "arguments for declaration">
-        <doc>
-          A set of arguments for the declaration. The syntax and semantics of these
-          arguments depends on the server implementation. This field is ignored if passive
-          is 1.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "declare-ok" synchronous = "1" index = "11" label = "confirm exchange declaration">
-      <doc>
-        This method confirms a Declare method and confirms the name of the exchange,
-        essential for automatically-named exchanges.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "delete" synchronous = "1" index = "20" label = "delete an exchange">
-      <doc>
-        This method deletes an exchange. When an exchange is deleted all queue bindings on
-        the exchange are cancelled.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "delete-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "active" access
-            rights to the exchange's access realm.
-          </doc>
-          <doc type = "scenario">
-            Client creates access ticket with wrong access rights and attempts to use
-            in this method.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <rule name = "exists" on-failure = "not-found">
-          <doc>
-            The client MUST NOT attempt to delete an exchange that does not exist.
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-      </field>
-
-      <!-- TODO 0.82 - discuss whether this option is useful or not.  I don't have
-           any real use case for it. /PH 2006-07-23.
-         -->
-      <field name = "if-unused" domain = "bit" label = "delete only if unused">
-        <doc>
-          If set, the server will only delete the exchange if it has no queue bindings. If
-          the exchange has queue bindings the server does not delete it but raises a
-          channel exception instead.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "delete-ok" synchronous = "1" index = "21"
-      label = "confirm deletion of an exchange">
-      <doc>This method confirms the deletion of an exchange.</doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  QUEUE  ============================================================ -->
-
-  <class name = "queue" handler = "channel" index = "50" label = "work with queues">
-    <doc>
-      Queues store and forward messages. Queues can be configured in the server or created at
-      runtime. Queues must be attached to at least one exchange in order to receive messages
-      from publishers.
-    </doc>
-
-    <doc type = "grammar">
-      queue               = C:DECLARE  S:DECLARE-OK
-                          / C:BIND     S:BIND-OK
-                          / C:PURGE    S:PURGE-OK
-                          / C:DELETE   S:DELETE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <rule name = "any-content">
-      <doc>
-        A server MUST allow any content class to be sent to any queue, in any mix, and
-        queue and deliver these content classes independently. Note that all methods
-        that fetch content off queues are specific to a given content class.
-      </doc>
-      <doc type = "scenario">
-        Client creates an exchange of each standard type and several queues that
-        it binds to each exchange. It must then sucessfully send each of the standard
-        content types to each of the available queues.
-      </doc>
-    </rule>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "declare" synchronous = "1" index = "10" label = "declare queue, create if needed">
-      <doc>
-        This method creates or checks a queue. When creating a new queue the client can
-        specify various properties that control the durability of the queue and its
-        contents, and the level of sharing for the queue.
-      </doc>
-
-      <rule name = "default-binding">
-        <doc>
-          The server MUST create a default binding for a newly-created queue to the
-          default exchange, which is an exchange of type 'direct'.
-        </doc>
-        <doc type = "scenario">
-          Client creates a new queue, and then without explicitly binding it to an
-          exchange, attempts to send a message through the default exchange binding,
-          i.e. publish a message to the empty exchange, with the queue name as routing
-          key.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_35" -->
-      <rule name = "minimum-queues">
-        <doc>
-          The server SHOULD support a minimum of 256 queues per virtual host and ideally,
-          impose no limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          Client attempts to create as many queues as it can until the server reports
-          an error.  The resulting count must at least be 256.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "declare-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          When a client defines a new queue, this belongs to the access realm of the
-          ticket used. All further work done with that queue must be done with an access
-          ticket for the same realm.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "active" access to
-            the realm in which the queue exists or will be created.
-          </doc>
-          <doc type = "scenario">
-            Client creates access ticket with wrong access rights and attempts to use
-            in this method.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <rule name = "default-name">
-          <doc>
-            The queue name MAY be empty, in which case the server MUST create a new
-            queue with a unique generated name and return this to the client in the
-            Declare-Ok method.
-          </doc>
-          <doc type = "scenario">
-            Client attempts to create several queues with an empty name. The client then
-            verifies that the server-assigned names are unique and different.
-          </doc>
-        </rule>
-        <rule name = "reserved-prefix" on-failure = "not-allowed">
-          <doc>
-            Queue names starting with "amq." are reserved for predeclared and
-            standardised server queues. A client MAY NOT attempt to declare a queue with a
-            name  that starts with "amq." and the passive option set to zero.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to create a queue with a name starting with "amq." and with
-            the passive option set to zero.
-          </doc>
-        </rule>
-        <assert check = "regexp" value = "^[a-zA-Z0-9-_.:]*$" />
-      </field>
-
-      <field name = "passive" domain = "bit" label = "do not create queue">
-        <doc>
-          If set, the server will not create the queue. This field allows the client
-          to assert the presence of a queue without modifying the server state.
-        </doc>
-        <rule name = "passive" on-failure = "not-found">
-          <doc>
-            The client MAY ask the server to assert that a queue exists without
-            creating the queue if not.  If the queue does not exist, the server
-            treats this as a failure.
-          </doc>
-          <doc type = "scenario">
-            Client declares an existing queue with the passive option and expects
-            the server to respond with a declare-ok. Client then attempts to declare
-            a non-existent queue with the passive option, and the server must close
-            the channel with the correct reply-code.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "durable" domain = "bit" label = "request a durable queue">
-        <doc>
-          If set when creating a new queue, the queue will be marked as durable. Durable
-          queues remain active when a server restarts. Non-durable queues (transient
-          queues) are purged if/when a server restarts. Note that durable queues do not
-          necessarily hold persistent messages, although it does not make sense to send
-          persistent messages to a transient queue.
-        </doc>
-        <!-- Rule test name: was "amq_queue_03" -->
-        <rule name = "persistence">
-          <doc>The server MUST recreate the durable queue after a restart.</doc>
-
-          <!-- TODO: use 'client does something' rather than 'a client does something'. -->
-          <doc type = "scenario">
-            A client creates a durable queue. The server is then restarted. The client
-            then attempts to send a message to the queue. The message should be successfully
-            delivered.
-          </doc>
-        </rule>
-        <!-- Rule test name: was "amq_queue_36" -->
-        <rule name = "types">
-          <doc>The server MUST support both durable and transient queues.</doc>
-          <doc type = "scenario">
-            A client creates two named queues, one durable and one transient.
-          </doc>
-        </rule>
-        <!-- Rule test name: was "amq_queue_37" -->    
-        <rule name = "pre-existence">
-          <doc>The server MUST ignore the durable field if the queue already exists.</doc>
-          <doc type = "scenario">
-            A client creates two named queues, one durable and one transient. The client
-            then attempts to declare the two queues using the same names again, but reversing
-            the value of the durable flag in each case. Verify that the queues still exist
-            with the original durable flag values.
-            <!-- TODO: but how? -->
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exclusive" domain = "bit" label = "request an exclusive queue">
-        <doc>
-          Exclusive queues may only be consumed from by the current connection. Setting
-          the 'exclusive' flag always implies 'auto-delete'.
-        </doc>
-
-        <!-- Rule test name: was "amq_queue_38" -->
-        <rule name = "types">
-          <doc>
-            The server MUST support both exclusive (private) and non-exclusive (shared)
-            queues.
-          </doc>
-          <doc type = "scenario">
-            A client creates two named queues, one exclusive and one non-exclusive.
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_queue_04" -->    
-        <rule name = "02" on-failure = "channel-error">
-          <doc>
-            The client MAY NOT attempt to declare any existing and exclusive queue
-            on multiple connections.
-          </doc>
-          <doc type = "scenario">
-            A client declares an exclusive named queue. A second client on a different
-            connection attempts to declare a queue of the same name.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "auto-delete" domain = "bit" label = "auto-delete queue when unused">
-        <doc>
-          If set, the queue is deleted when all consumers have finished using it. Last
-          consumer can be cancelled either explicitly or because its channel is closed. If
-          there was no consumer ever on the queue, it won't be deleted.
-        </doc>
-
-        <!-- Rule test name: was "amq_queue_31" -->
-        <rule name = "pre-existence">
-          <doc>
-            The server MUST ignore the auto-delete field if the queue already exists.
-          </doc>
-          <doc type = "scenario">
-            A client creates two named queues, one as auto-delete and one explicit-delete.
-            The client then attempts to declare the two queues using the same names again,
-            but reversing the value of the auto-delete field in each case. Verify that the
-            queues still exist with the original auto-delete flag values.
-            <!-- TODO: but how? -->
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "arguments" domain = "table" label = "arguments for declaration">
-        <doc>
-          A set of arguments for the declaration. The syntax and semantics of these
-          arguments depends on the server implementation. This field is ignored if passive
-          is 1.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "declare-ok" synchronous = "1" index = "11" label = "confirms a queue definition">
-      <doc>
-        This method confirms a Declare method and confirms the name of the queue, essential
-        for automatically-named queues.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Reports the name of the queue. If the server generated a queue name, this field
-          contains that name.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "message-count" domain = "long" label = "number of messages in queue">
-        <doc>
-          Reports the number of messages in the queue, which will be zero for
-          newly-created queues.
-        </doc>
-      </field>
-      
-      <field name = "consumer-count" domain = "long" label = "number of consumers">
-        <doc>
-          Reports the number of active consumers for the queue. Note that consumers can
-          suspend activity (Channel.Flow) in which case they do not appear in this count.
-        </doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "bind" synchronous = "1" index = "20" label = "bind queue to an exchange">
-      <doc>
-        This method binds a queue to an exchange. Until a queue is bound it will not receive
-        any messages. In a classic messaging model, store-and-forward queues are bound to a
-        dest exchange and subscription queues are bound to a dest_wild exchange.
-      </doc>
-
-      <!-- Rule test name: was "amq_queue_25" -->
-      <rule name = "duplicates">
-        <doc>
-          A server MUST allow ignore duplicate bindings - that is, two or more bind
-          methods for a specific queue, with identical arguments - without treating these
-          as an error.
-        </doc>
-        <doc type = "scenario">
-          A client binds a named queue to an exchange. The client then repeats the bind
-          (with identical arguments).
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_39" -->
-      <rule name = "failure" on-failure = "??????">
-        <!--
-        TODO: Find correct code. The on-failure code returned should depend on why the bind
-        failed. Assuming that failures owing to bad parameters are covered in the rules relating
-        to those parameters, the only remaining reason for a failure would be the lack of
-        server resorces or some internal error - such as too many queues open. Would these
-        cases qualify as "resource error" 506 or "internal error" 541?
-        -->
-        <doc>If a bind fails, the server MUST raise a connection exception.</doc>
-        <doc type = "scenario">
-          TODO
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_12" -->
-      <rule name = "transient-exchange" on-failure = "not-allowed">
-        <doc>
-          The server MUST NOT allow a durable queue to bind to a transient exchange.
-        </doc>
-        <doc type = "scenario">
-          A client creates a transient exchange. The client then declares a named durable
-          queue and then attempts to bind the transient exchange to the durable queue.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_13" -->
-      <rule name = "durable-exchange">
-        <doc>
-          Bindings for durable queues are automatically durable and the server SHOULD
-          restore such bindings after a server restart.
-        </doc>
-        <doc type = "scenario">
-          A server creates a named durable queue and binds it to a durable exchange. The
-          server is restarted. The client then attempts to use the queue/exchange combination.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_17" -->
-      <rule name = "internal-exchange">
-        <doc>
-          If the client attempts to bind to an exchange that was declared as internal, the server
-          MUST raise a connection exception with reply code 530 (not allowed).
-        </doc>
-        <doc type = "scenario">
-          A client attempts to bind a named queue to an internal exchange.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_40" -->
-      <rule name = "binding-count">
-        <doc>
-          The server SHOULD support at least 4 bindings per queue, and ideally, impose no
-          limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          A client creates a named queue and attempts to bind it to 4 different non-internal
-          exchanges.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-
-      <response name = "bind-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          The client provides a valid access ticket giving "active" access rights to the
-          queue's access realm.
-        </doc>
-      </field>
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to bind. If the queue name is empty, refers to
-          the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "empty-queue" on-failure = "not-allowed">
-          <doc>
-            A client MUST NOT be allowed to bind a non-existent and unnamed queue (i.e.
-            empty queue name) to an exchange.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to bind with an unnamed (empty) queue name to an exchange.
-          </doc>
-        </rule>
-        
-        <!-- Rule test name: was "amq_queue_26" -->    
-        <rule name = "queue-existence" on-failure = "not-found">
-          <doc>
-            A client MUST NOT be allowed to bind a non-existent queue (i.e. not previously
-            declared) to an exchange.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to bind an undeclared queue name to an exchange.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "exchange" domain = "exchange-name" label = "name of the exchange to bind to">
-        <!-- Rule test name: was "amq_queue_14" -->    
-        <rule name = "exchange-existence" on-failure = "not-found">
-          <doc>
-            A client MUST NOT be allowed to bind a queue to a non-existent exchange.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to bind an named queue to a undeclared exchange.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "routing-key" domain = "shortstr" label = "message routing key">
-        <doc>
-          Specifies the routing key for the binding. The routing key is used for routing
-          messages depending on the exchange configuration. Not all exchanges use a
-          routing key - refer to the specific exchange documentation.  If the queue name
-          is empty, the server uses the last queue declared on the channel.  If the
-          routing key is also empty, the server uses this queue name for the routing
-          key as well.  If the queue name is provided but the routing key is empty, the
-          server does the binding with that empty routing key.  The meaning of empty
-          routing keys depends on the exchange implementation.
-        </doc>
-      </field>
-      
-      <field name = "arguments" domain = "table" label = "arguments for binding">
-        <doc>
-          A set of arguments for the binding. The syntax and semantics of these arguments
-          depends on the exchange class.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "bind-ok" synchronous = "1" index = "21" label = "confirm bind successful">
-      <doc>This method confirms that the bind was successful.</doc>
-      
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "purge" synchronous = "1" index = "30" label = "purge a queue">
-      <doc>
-        This method removes all messages from a queue. It does not cancel consumers. Purged
-        messages are deleted without any formal "undo" mechanism.
-      </doc>
-      
-      <!-- Rule test name: was "amq_queue_15" -->    
-      <rule name = "01">
-        <doc>A call to purge MUST result in an empty queue.</doc>
-      </rule>
-      
-      <!-- Rule test name: was "amq_queue_41" -->
-      <rule name = "02">
-        <doc>
-          On transacted channels the server MUST not purge messages that have already been
-          sent to a client but not yet acknowledged.
-        </doc>
-      </rule>
-      
-      <!-- TODO: Rule split? -->
-      
-      <!-- Rule test name: was "amq_queue_42" -->    
-      <rule name = "03">
-        <doc>
-          The server MAY implement a purge queue or log that allows system administrators
-          to recover accidentally-purged messages. The server SHOULD NOT keep purged
-          messages in the same storage spaces as the live messages since the volumes of
-          purged messages may get very large.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "purge-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <doc>The access ticket must be for the access realm that holds the queue.</doc>
-        
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the queue's access realm. Note that purging a queue is equivalent to reading
-            all messages and discarding them.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to purge. If the queue name is empty, refers to
-          the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-        
-        <!-- TODO Rule split? -->
-        
-        <!-- Rule test name: was "amq_queue_16" -->    
-        <rule name = "02">
-          <doc>
-            The queue MUST exist. Attempting to purge a non-existing queue MUST cause a
-            channel exception.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "purge-ok" synchronous = "1" index = "31" label = "confirms a queue purge">
-      <doc>This method confirms the purge of a queue.</doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "message-count" domain = "long" label = "number of messages purged">
-        <doc>Reports the number of messages purged.</doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "delete" synchronous = "1" index = "40" label = "delete a queue">
-      <doc>
-        This method deletes a queue. When a queue is deleted any pending messages are sent
-        to a dead-letter queue if this is defined in the server configuration, and all
-        consumers on the queue are cancelled.
-      </doc>
-
-      <!-- TODO: Rule split? -->
-
-      <!-- Rule test name: was "amq_queue_43" -->
-      <rule name = "01">
-        <doc>
-          The server SHOULD use a dead-letter queue to hold messages that were pending on
-          a deleted queue, and MAY provide facilities for a system administrator to move
-          these messages back to an active queue.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <response name = "delete-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          The client provides a valid access ticket giving "active" access rights to the
-          queue's access realm.
-        </doc>
-      </field>
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to delete. If the queue name is empty, refers to
-          the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_queue_21" -->
-        <rule name = "02">
-          <doc>
-            The queue must exist. If the client attempts to delete a non-existing queue
-            the server MUST raise a channel exception with reply code 404 (not found).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "if-unused" domain = "bit" label = "delete only if unused">
-        <doc>
-          If set, the server will only delete the queue if it has no consumers. If the
-          queue has consumers the server does does not delete it but raises a channel
-          exception instead.
-        </doc>
-
-        <!-- Rule test name: was "amq_queue_29" and "amq_queue_30" -->
-        <rule name = "01">
-          <doc>The server MUST respect the if-unused flag when deleting a queue.</doc>
-        </rule>
-      </field>
-
-      <field name = "if-empty" domain = "bit" label = "delete only if empty">
-        <doc>
-          If set, the server will only delete the queue if it has no messages.
-        </doc>
-        <rule name = "01">
-          <doc>
-          If the queue is not empty the server MUST raise a channel exception with
-          reply code 406 (precondition failed).
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "delete-ok" synchronous = "1" index = "41" label = "confirm deletion of a queue">
-      <doc>This method confirms the deletion of a queue.</doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "message-count" domain = "long" label = "number of messages purged">
-        <doc>Reports the number of messages purged.</doc>
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  BASIC  ============================================================ -->
-
-  <class name = "basic" handler = "channel" index = "60" label = "work with basic content">
-    <doc>
-      The Basic class provides methods that support an industry-standard messaging model.
-    </doc>
-
-    <doc type = "grammar">
-      basic               = C:QOS S:QOS-OK
-                          / C:CONSUME S:CONSUME-OK
-                          / C:CANCEL S:CANCEL-OK
-                          / C:PUBLISH content
-                          / S:RETURN content
-                          / S:DELIVER content
-                          / C:GET ( S:GET-OK content / S:GET-EMPTY )
-                          / C:ACK
-                          / C:REJECT
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MAY" />
-
-    <!-- Rule test name: was "amq_basic_08" -->
-    <rule name = "01">
-      <doc>
-        The server SHOULD respect the persistent property of basic messages and
-        SHOULD make a best-effort to hold persistent basic messages on a reliable
-        storage mechanism.
-      </doc>
-      <doc type = "scenario">
-        Send a persistent message to queue, stop server, restart server and then
-        verify whether message is still present.  Assumes that queues are durable.
-        Persistence without durable queues makes no sense.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_09" -->
-    <rule name = "02">
-      <doc>
-        The server MUST NOT discard a persistent basic message in case of a queue
-        overflow.
-      </doc>
-      <doc type = "scenario">
-        Create a queue overflow situation with persistent messages and verify that
-        messages do not get lost (presumably the server will write them to disk).
-      </doc>
-    </rule>
-
-    <rule name = "03">
-      <doc>
-        The server MAY use the Channel.Flow method to slow or stop a basic message
-        publisher when necessary.
-      </doc>
-      <doc type = "scenario">
-        Create a queue overflow situation with non-persistent messages and verify
-        whether the server responds with Channel.Flow or not. Repeat with persistent
-        messages.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_10" -->
-    <rule name = "04">
-      <doc>
-        The server MAY overflow non-persistent basic messages to persistent
-        storage.
-      </doc>
-      <!-- Test scenario: untestable -->
-    </rule>
-
-    <rule name = "05">
-      <doc>
-        The server MAY discard or dead-letter non-persistent basic messages on a
-        priority basis if the queue size exceeds some configured limit.
-      </doc>
-      <!-- Test scenario: untestable -->
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_11" -->
-    <rule name = "06">
-      <doc>
-        The server MUST implement at least 2 priority levels for basic messages,
-        where priorities 0-4 and 5-9 are treated as two distinct levels.
-      </doc>
-      <doc type = "scenario">
-        Send a number of priority 0 messages to a queue. Send one priority 9
-        message.  Consume messages from the queue and verify that the first message
-        received was priority 9.
-      </doc>
-    </rule>
-
-    <rule name = "07">
-      <doc>
-        The server MAY implement up to 10 priority levels.
-      </doc>
-      <doc type = "scenario">
-        Send a number of messages with mixed priorities to a queue, so that all
-        priority values from 0 to 9 are exercised. A good scenario would be ten
-        messages in low-to-high priority.  Consume from queue and verify how many
-        priority levels emerge.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_12" -->
-    <rule name = "08">
-      <doc>
-        The server MUST deliver messages of the same priority in order irrespective of
-        their individual persistence.
-      </doc>
-      <doc type = "scenario">
-        Send a set of messages with the same priority but different persistence
-        settings to a queue.  Consume and verify that messages arrive in same order
-        as originally published.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_13" -->
-    <rule name = "09">
-      <doc>
-        The server MUST support automatic acknowledgements on Basic content, i.e.
-        consumers with the no-ack field set to FALSE.
-      </doc>
-      <doc type = "scenario">
-        Create a queue and a consumer using automatic acknowledgements.  Publish
-        a set of messages to the queue.  Consume the messages and verify that all
-        messages are received.
-      </doc>
-    </rule>
-
-    <rule name = "10">
-      <doc>
-        The server MUST support explicit acknowledgements on Basic content, i.e.
-        consumers with the no-ack field set to TRUE.
-      </doc>
-      <doc type = "scenario">
-        Create a queue and a consumer using explicit acknowledgements.  Publish a
-        set of messages to the queue.  Consume the messages but acknowledge only
-        half of them.  Disconnect and reconnect, and consume from the queue.
-        Verify that the remaining messages are received.
-      </doc>
-    </rule>
-
-    <!--  These are the properties for a Basic content  -->
-
-    <field name = "content-type"    domain = "shortstr"   label = "MIME content type" />
-    <field name = "content-encoding" domain = "shortstr"  label = "MIME content encoding" />
-    <field name = "headers"         domain = "table"      label = "message header field table" />
-    <field name = "delivery-mode"   domain = "octet"      label = "non-persistent (1) or persistent (2)" />
-    <field name = "priority"        domain = "short"      label = "message priority, 0 to 9" />
-    <field name = "correlation-id"  domain = "shortstr"   label = "application correlation identifier" />
-    <field name = "reply-to"        domain = "shortstr"   label = "destination to reply to" />
-    <field name = "expiration"      domain = "shortstr"   label = "message expiration specification" />
-    <field name = "timestamp"       domain = "timestamp"  label = "message timestamp" />
-    <field name = "message-id"      domain = "shortstr"   label = "application message identifier" />
-    <field name = "type"            domain = "shortstr"   label = "message type name" />
-    <field name = "user-id"         domain = "shortstr"   label = "creating user id" />
-    <field name = "app-id"          domain = "shortstr"   label = "creating application id" />
-    <!-- This field is deprecated pending review -->
-    <field name = "cluster-id"      domain = "shortstr"   label = "intra-cluster routing identifier" />
-
-    <!-- Type diversity test -->
-    <field name = "property-bit"    domain = "bit"       label = "Extra property for testing only" />
-    <field name = "property-octet"    domain = "octet"     label = "Extra property for testing only" />
-    <field name = "property-short"  domain = "short"     label = "Extra property for testing only" />
-    <field name = "property-long"   domain = "long"      label = "Extra property for testing only" />
-    <field name = "property-longlong"   domain = "longlong"  label = "Extra property for testing only" />
-    <field name = "property-shortstr"    domain = "shortstr"  label = "Extra property for testing only" />
-    <field name = "property-longstr"  domain = "longstr"   label = "Extra property for testing only" />
-    <field name = "property-timestamp"  domain = "timestamp" label = "Extra property for testing only" />
-    <field name = "property-table"   domain = "table"     label = "Extra property for testing only" />
-    <field name = "property-access-ticket"   domain = "access-ticket"     label = "Extra property for testing only" />
-    <field name = "property-class-id"   domain = "class-id"     label = "Extra property for testing only" />
-    <field name = "property-consumer-tag"   domain = "consumer-tag"     label = "Extra property for testing only" />
-    <field name = "property-delivery-tag"   domain = "delivery-tag"     label = "Extra property for testing only" />
-    <field name = "property-exchange-name"   domain = "exchange-name"     label = "Extra property for testing only" />
-    <field name = "property-known-hosts"   domain = "known-hosts"     label = "Extra property for testing only" />
-    <field name = "property-method-id"   domain = "method-id"     label = "Extra property for testing only" />
-    <field name = "property-no-ack"   domain = "no-ack"     label = "Extra property for testing only" />
-    <field name = "property-no-local"   domain = "no-local"     label = "Extra property for testing only" />
-    <field name = "property-path"   domain = "path"     label = "Extra property for testing only" />
-    <field name = "property-peer-properties"   domain = "peer-properties"     label = "Extra property for testing only" />
-    <field name = "property-queue-name"   domain = "queue-name"     label = "Extra property for testing only" />
-    <field name = "property-redelivered"   domain = "redelivered"     label = "Extra property for testing only" />
-    <field name = "property-reply-code"   domain = "reply-code"     label = "Extra property for testing only" />
-    <field name = "property-reply-text"   domain = "reply-text"     label = "Extra property for testing only" />
-
-    <!-- Bit field test -->
-    <field name = "property-long-A"   domain = "long"      label = "Extra property for testing only" />
-    <field name = "property-bit-B"    domain = "bit"       label = "Extra property for testing only" />
-    <field name = "property-bit-C"    domain = "bit"       label = "Extra property for testing only" />
-    <field name = "property-bit-D"    domain = "bit"       label = "Extra property for testing only" />
-    <field name = "property-bit-E"    domain = "bit"       label = "Extra property for testing only" />
-    <field name = "property-bit-F"    domain = "bit"       label = "Extra property for testing only" />
-    <field name = "property-shortstr-G"    domain = "shortstr"  label = "Extra property for testing only" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "qos" synchronous = "1" index = "10" label = "specify quality of service">
-      <doc>
-        This method requests a specific quality of service. The QoS can be specified for the
-        current channel or for all channels on the connection. The particular properties and
-        semantics of a qos method always depend on the content class semantics. Though the
-        qos method could in principle apply to both peers, it is currently meaningful only
-        for the server.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "qos-ok" />
-
-      <field name = "prefetch-size" domain = "long" label = "prefetch window in octets">
-        <doc>
-          The client can request that messages be sent in advance so that when the client
-          finishes processing a message, the following message is already held locally,
-          rather than needing to be sent down the channel. Prefetching gives a performance
-          improvement. This field specifies the prefetch window size in octets. The server
-          will send a message in advance if it is equal to or smaller in size than the
-          available prefetch size (and also falls into other prefetch limits). May be set
-          to zero, meaning "no specific limit", although other prefetch limits may still
-          apply. The prefetch-size is ignored if the no-ack option is set.
-        </doc>
-        <!-- Rule test name: was "amq_basic_17" -->
-        <rule name = "01">
-          <doc>
-            The server MUST ignore this setting when the client is not processing any
-            messages - i.e. the prefetch size does not limit the transfer of single
-            messages to a client, only the sending in advance of more messages while
-            the client still has one or more unacknowledged messages.
-          </doc>
-          <doc type = "scenario">
-            Define a QoS prefetch-size limit and send a single message that exceeds
-            that limit.  Verify that the message arrives correctly.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "prefetch-count" domain = "short" label = "prefetch window in messages">
-        <doc>
-          Specifies a prefetch window in terms of whole messages. This field may be used
-          in combination with the prefetch-size field; a message will only be sent in
-          advance if both prefetch windows (and those at the channel and connection level)
-          allow it. The prefetch-count is ignored if the no-ack option is set.
-        </doc>
-        <!-- Rule test name: was "amq_basic_18" -->
-        <rule name = "01">
-          <doc>
-            The server may send less data in advance than allowed by the client's
-            specified prefetch windows but it MUST NOT send more.
-          </doc>
-          <doc type = "scenario">
-            Define a QoS prefetch-size limit and a prefetch-count limit greater than
-            one.  Send multiple messages that exceed the prefetch size.  Verify that
-            no more than one message arrives at once.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "global" domain = "bit" label = "apply to entire connection">
-        <doc>
-          By default the QoS settings apply to the current channel only. If this field is
-          set, they are applied to the entire connection.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "qos-ok" synchronous = "1" index = "11" label = "confirm the requested qos">
-      <doc>
-        This method tells the client that the requested QoS levels could be handled by the
-        server. The requested QoS applies to all active consumers until a new QoS is
-        defined.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "consume" synchronous = "1" index = "20" label = "start a queue consumer">
-      <doc>
-        This method asks the server to start a "consumer", which is a transient request for
-        messages from a specific queue. Consumers last as long as the channel they were
-        created on, or until the client cancels them.
-      </doc>
-
-      <!-- Rule test name: was "amq_basic_01" -->
-      <rule name = "01">
-        <doc>
-          The server SHOULD support at least 16 consumers per queue, and ideally, impose
-          no limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          Create a queue and create consumers on that queue until the server closes the
-          connection. Verify that the number of consumers created was at least sixteen
-          and report the total number.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "consume-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create a consumer with an invalid (non-zero) access ticket.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-        <rule name = "01" on-failure = "not-allowed">
-          <doc>
-            If the queue name is empty the client MUST have previously declared a
-            queue using this channel.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create a consumer with an empty queue name and no previously
-            declared queue on the channel.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Specifies the identifier for the consumer. The consumer tag is local to a
-          connection, so two clients can use the same consumer tags. If this field is
-          empty the server will generate a unique tag.
-        </doc>
-        <rule name = "01" on-failure = "not-allowed">
-          <doc>
-            The client MUST NOT specify a tag that refers to an existing consumer.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create two consumers with the same non-empty tag.
-          </doc>
-        </rule>
-        <rule name = "02" on-failure = "not-allowed">
-          <doc>
-            The consumer tag is valid only within the channel from which the
-            consumer was created. I.e. a client MUST NOT create a consumer in one
-            channel and then use it in another.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create a consumer in one channel, then use in another channel,
-            in which consumers have also been created (to test that the server uses
-            unique consumer tags).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "no-local" domain = "no-local" />
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise
-          a channel or connection exception.
-        </doc>
-      </field>
-
-      <field name = "bit-test-1" domain = "bit" />
-      <field name = "bit-test-2" domain = "bit" />
-      <field name = "bit-test-3" domain = "bit" />
-      <field name = "bit-test-4" domain = "bit" />
-      <field name = "bit-test-5" domain = "bit" />
-      <field name = "bit-test-6" domain = "bit" />
-      <field name = "bit-test-7" domain = "bit" />
-      <field name = "bit-test-8" domain = "bit" />
-      <field name = "bit-test-9" domain = "bit" />
-
-      <field name = "no-ack" domain = "short" />
-
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive consumer access, meaning only this consumer can access the
-          queue.
-        </doc>
-        <!-- Rule test name: was "amq_basic_02" -->
-        <rule name = "01" on-failure = "access-refused">
-          <doc>
-            The client MAY NOT gain exclusive access to a queue that already has
-            active consumers.
-          </doc>
-          <doc type = "scenario">
-            Open two connections to a server, and in one connection create a shared
-            (non-exclusive) queue and then consume from the queue.  In the second
-            connection attempt to consume from the same queue using the exclusive
-            option.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "priority" domain = "short" label = "consume priority"/>
-    </method>
-
-    <method name = "consume-ok" synchronous = "1" index = "21" label = "confirm a new consumer">
-      <doc>
-        The server provides the client with a consumer tag, which is used by the client
-        for methods called on the consumer at a later stage.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Holds the consumer tag specified by the client or provided by the server.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "cancel" synchronous = "1" index = "30" label = "end a queue consumer">
-      <doc>
-        This method cancels a consumer. This does not affect already delivered
-        messages, but it does mean the server will not send any more messages for
-        that consumer. The client may receive an abitrary number of messages in
-        between sending the cancel method and receiving the cancel-ok reply.
-      </doc>
-
-      <rule name = "01">
-        <doc>
-          If the queue does not exist the server MUST ignore the cancel method, so
-          long as the consumer tag is valid for that channel.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "cancel-ok" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <method name = "cancel-ok" synchronous = "1" index = "31" label = "confirm a cancelled consumer">
-      <doc>
-        This method confirms that the cancellation was completed.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "publish" content = "1" index = "40" label = "publish a message">
-      <doc>
-        This method publishes a message to a specific exchange. The message will be routed
-        to queues as defined by the exchange configuration and distributed to any active
-        consumers when the transaction, if any, is committed.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "write" access rights
-            to the access realm for the exchange.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange to publish to. The exchange name can be
-          empty, meaning the default exchange. If the exchange name is specified, and that
-          exchange does not exist, the server will raise a channel exception.
-        </doc>
-
-        <!-- Rule test name: was "amq_basic_06" -->
-        <rule name = "01">
-          <doc>
-            The server MUST accept a blank exchange name to mean the default exchange.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_basic_14" -->
-        <rule name = "02">
-          <doc>
-            If the exchange was declared as an internal exchange, the server MUST raise
-            a channel exception with a reply code 403 (access refused).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_basic_15" -->
-        <rule name = "03">
-          <doc>
-            The exchange MAY refuse basic content in which case it MUST raise a channel
-            exception with reply code 540 (not implemented).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key for the message. The routing key is used for routing
-          messages depending on the exchange configuration.
-        </doc>
-      </field>
-
-      <field name = "mandatory" domain = "bit" label = "indicate mandatory routing">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue. If this flag is set, the server will return an unroutable message with a
-          Return method. If this flag is zero, the server silently drops the message.
-        </doc>
-        <!-- Rule test name: was "amq_basic_07" -->
-        <rule name = "01">
-          <doc>
-            The server SHOULD implement the mandatory flag.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "immediate" domain = "bit" label = "request immediate delivery">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue consumer immediately. If this flag is set, the server will return an
-          undeliverable message with a Return method. If this flag is zero, the server
-          will queue the message, but with no guarantee that it will ever be consumed.
-        </doc>
-        <!-- Rule test name: was "amq_basic_16" -->
-        <rule name = "01">
-          <doc>
-            The server SHOULD implement the immediate flag.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "return" content = "1" index = "50" label = "return a failed message">
-      <doc>
-        This method returns an undeliverable message that was published with the "immediate"
-        flag set, or an unroutable message published with the "mandatory" flag set. The
-        reply code and text provide information about the reason that the message was
-        undeliverable.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "reply-code" domain = "reply-code" />
-
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key name specified when the message was published.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "deliver" content = "1" index = "60"
-      label = "notify the client of a consumer message">
-      <doc>
-        This method delivers a message to the client, via a consumer. In the asynchronous
-        message delivery model, the client starts a consumer using the Consume method, then
-        the server responds with Deliver methods as and when messages arrive for that
-        consumer.
-      </doc>
-
-      <!-- Rule test name: was "amq_basic_19" -->
-      <rule name = "01">
-        <!-- TODO: Rule split? -->
-        <doc>
-          The server SHOULD track the number of times a message has been delivered to
-          clients and when a message is redelivered a certain number of times - e.g. 5
-          times - without being acknowledged, the server SHOULD consider the message to be
-          unprocessable (possibly causing client applications to abort), and move the
-          message to a dead letter queue.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "redelivered" domain = "redelivered" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "get" synchronous = "1" index = "70" label = "direct access to a queue">
-      <doc>
-        This method provides a direct access to the messages in a queue using a synchronous
-        dialogue that is designed for specific types of application where synchronous
-        functionality is more important than performance.
-      </doc>
-
-      <response name = "get-ok" />
-      <response name = "get-empty" />
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "no-ack" domain = "no-ack" />
-    </method>
-
-    <method name = "get-ok" synchronous = "1" content = "1" index = "71"
-      label = "provide client with a message">
-      <doc>
-        This method delivers a message to the client following a get method. A message
-        delivered by 'get-ok' must be acknowledged unless the no-ack option was set in the
-        get method.
-      </doc>
-
-      <chassis name = "client" implement = "MAY" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "redelivered" domain = "redelivered" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-          If empty, the message was published to the default exchange.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-
-      <field name = "message-count" domain = "long" label = "number of messages pending">
-        <doc>
-          This field reports the number of messages pending on the queue, excluding the
-          message being delivered. Note that this figure is indicative, not reliable, and
-          can change arbitrarily as messages are added to the queue and removed by other
-          clients.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "get-empty" synchronous = "1" index = "72"
-      label = "indicate no messages available">
-      <doc>
-        This method tells the client that the queue has no messages available for the
-        client.
-      </doc>
-
-      <chassis name = "client" implement = "MAY" />
-
-      <!-- This field is deprecated pending review -->
-      <field name = "cluster-id" domain = "shortstr" label = "Cluster id">
-        <doc>
-          For use by cluster applications, should not be used by client applications.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "ack" index = "80" label = "acknowledge one or more messages">
-      <doc>
-        This method acknowledges one or more messages delivered via the Deliver or Get-Ok
-        methods. The client can ask to confirm a single message or a set of messages up to
-        and including a specific message.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "multiple" domain = "bit" label = "acknowledge multiple messages">
-        <doc>
-          If set to 1, the delivery tag is treated as "up to and including", so that the
-          client can acknowledge multiple messages with a single method. If set to zero,
-          the delivery tag refers to a single message. If the multiple field is 1, and the
-          delivery tag is zero, tells the server to acknowledge all outstanding mesages.
-        </doc>
-
-        <!-- Rule test name: was "amq_basic_20" -->
-        <rule name = "01">
-          <doc>
-            The server MUST validate that a non-zero delivery-tag refers to an delivered
-            message, and raise a channel exception if this is not the case.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "reject" index = "90" label = "reject an incoming message">
-      <doc>
-        This method allows a client to reject a message. It can be used to interrupt and
-        cancel large incoming messages, or return untreatable messages to their original
-        queue.
-      </doc>
-
-      <!-- Rule test name: was "amq_basic_21" -->
-      <rule name = "01">
-        <doc>
-          The server SHOULD be capable of accepting and process the Reject method while
-          sending message content with a Deliver or Get-Ok method. I.e. the server should
-          read and process incoming methods while sending output frames. To cancel a
-          partially-send content, the server sends a content body frame of size 1 (i.e.
-          with no data except the frame-end octet).
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_basic_22" -->
-      <rule name = "02">
-        <doc>
-          The server SHOULD interpret this method as meaning that the client is unable to
-          process the message at this time.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <rule name = "03">
-        <!-- TODO: Rule split? -->
-        <doc>
-          A client MUST NOT use this method as a means of selecting messages to process. A
-          rejected message MAY be discarded or dead-lettered, not necessarily passed to
-          another client.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "requeue" domain = "bit" label = "requeue the message">
-        <doc>
-          If this field is zero, the message will be discarded. If this bit is 1, the
-          server will attempt to requeue the message.
-        </doc>
-
-        <!-- Rule test name: was "amq_basic_23" -->
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MUST NOT deliver the message to the same client within the
-            context of the current channel. The recommended strategy is to attempt to
-            deliver the message to an alternative consumer, and if that is not possible,
-            to move the message to a dead-letter queue. The server MAY use more
-            sophisticated tracking to hold the message on the queue and redeliver it to
-            the same client at a later stage.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "recover" index = "100" label = "redeliver unacknowledged messages">
-      <doc>
-        This method asks the broker to redeliver all unacknowledged messages on a specified
-        channel. Zero or more messages may be redelivered. This method is only allowed on
-        non-transacted channels.
-      </doc>
-
-      <rule name = "01">
-        <doc>
-          The server MUST set the redelivered flag on all messages that are resent.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <rule name = "02">
-        <doc>
-          The server MUST raise a channel exception if this is called on a transacted
-          channel.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "requeue" domain = "bit" label = "requeue the message">
-        <doc>
-          If this field is zero, the message will be redelivered to the original
-          recipient. If this bit is 1, the server will attempt to requeue the message,
-          potentially then delivering it to an alternative subscriber.
-        </doc>
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  FILE  ============================================================= -->
-
-  <class name = "file" handler = "channel" index = "70" label = "work with file content">
-    <doc>
-      The file class provides methods that support reliable file transfer. File
-      messages have a specific set of properties that are required for interoperability
-      with file transfer applications. File messages and acknowledgements are subject to
-      channel transactions. Note that the file class does not provide message browsing
-      methods; these are not compatible with the staging model. Applications that need
-      browsable file transfer should use Basic content and the Basic class.
-    </doc>
-
-    <doc type = "grammar">
-      file                = C:QOS S:QOS-OK
-                          / C:CONSUME S:CONSUME-OK
-                          / C:CANCEL S:CANCEL-OK
-                          / C:OPEN S:OPEN-OK C:STAGE content
-                          / S:OPEN C:OPEN-OK S:STAGE content
-                          / C:PUBLISH
-                          / S:DELIVER
-                          / S:RETURN
-                          / C:ACK
-                          / C:REJECT
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <rule name = "01">
-      <doc>
-        The server MUST make a best-effort to hold file messages on a reliable storage
-        mechanism.
-      </doc>
-    </rule>
-
-    <!-- TODO Rule implement attr inverse? -->
-
-    <!-- TODO: Rule split? -->
-
-    <rule name = "02">
-      <doc>
-        The server MUST NOT discard a file message in case of a queue overflow. The server
-        MUST use the Channel.Flow method to slow or stop a file message publisher when
-        necessary.
-      </doc>
-    </rule>
-
-    <!-- TODO: Rule split? -->
-
-    <rule name = "03">
-      <doc>
-        The server MUST implement at least 2 priority levels for file messages, where
-        priorities 0-4 and 5-9 are treated as two distinct levels. The server MAY implement
-        up to 10 priority levels.
-      </doc>
-    </rule>
-    
-    <rule name = "04">
-      <doc>
-        The server MUST support both automatic and explicit acknowledgements on file
-        content.
-      </doc>
-    </rule>
-    
-    <!--  These are the properties for a File content  -->
-
-    <field name = "content-type"    domain = "shortstr"   label = "MIME content type" />
-    <field name = "content-encoding" domain = "shortstr"  label = "MIME content encoding" />
-    <field name = "headers"         domain = "table"      label = "message header field table" />
-    <field name = "priority"        domain = "octet"      label = "message priority, 0 to 9" />
-    <field name = "reply-to"        domain = "shortstr"   label = "destination to reply to" />
-    <field name = "message-id"      domain = "shortstr"   label = "application message identifier" />
-    <field name = "filename"        domain = "shortstr"   label = "message filename" />
-    <field name = "timestamp"       domain = "timestamp"  label = "message timestamp" />
-    <!-- This field is deprecated pending review -->
-    <field name = "cluster-id"      domain = "shortstr"   label = "intra-cluster routing identifier" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "qos" synchronous = "1" index = "10" label = "specify quality of service">
-      <doc>
-        This method requests a specific quality of service. The QoS can be specified for the
-        current channel or for all channels on the connection. The particular properties and
-        semantics of a qos method always depend on the content class semantics. Though the
-        qos method could in principle apply to both peers, it is currently meaningful only
-        for the server.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "qos-ok" />
-      
-      <field name = "prefetch-size" domain = "long" label = "prefetch window in octets">
-        <doc>
-          The client can request that messages be sent in advance so that when the client
-          finishes processing a message, the following message is already held locally,
-          rather than needing to be sent down the channel. Prefetching gives a performance
-          improvement. This field specifies the prefetch window size in octets. May be set
-          to zero, meaning "no specific limit". Note that other prefetch limits may still
-          apply. The prefetch-size is ignored if the no-ack option is set.
-        </doc>
-      </field>
-      
-      <field name = "prefetch-count" domain = "short" label = "prefetch window in messages">
-        <doc>
-          Specifies a prefetch window in terms of whole messages. This is compatible with
-          some file API implementations. This field may be used in combination with the
-          prefetch-size field; a message will only be sent in advance if both prefetch
-          windows (and those at the channel and connection level) allow it. The
-          prefetch-count is ignored if the no-ack option is set.
-        </doc>
-        
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MAY send less data in advance than allowed by the client's
-            specified prefetch windows but it MUST NOT send more.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "global" domain = "bit" label = "apply to entire connection">
-        <doc>
-          By default the QoS settings apply to the current channel only. If this field is
-          set, they are applied to the entire connection.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "qos-ok" synchronous = "1" index = "11" label = "confirm the requested qos">
-      <doc>
-        This method tells the client that the requested QoS levels could be handled by the
-        server. The requested QoS applies to all active consumers until a new QoS is
-        defined.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "consume" synchronous = "1" index = "20" label = "start a queue consumer">
-      <doc>
-        This method asks the server to start a "consumer", which is a transient request for
-        messages from a specific queue. Consumers last as long as the channel they were
-        created on, or until the client cancels them.
-      </doc>
-      
-      <rule name = "01">
-        <doc>
-          The server SHOULD support at least 16 consumers per queue, unless the queue was
-          declared as private, and ideally, impose no limit except as defined by available
-          resources.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "consume-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Specifies the identifier for the consumer. The consumer tag is local to a
-          connection, so two clients can use the same consumer tags. If this field is
-          empty the server will generate a unique tag.
-        </doc>
-        
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The tag MUST NOT refer to an existing consumer. If the client attempts to
-            create two consumers with the same non-empty tag the server MUST raise a
-            connection exception with reply code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "no-local" domain = "no-local" />
-      
-      <field name = "no-ack" domain = "no-ack" />
-      
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive consumer access, meaning only this consumer can access the
-          queue.
-        </doc>
-
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>
-            If the server cannot grant exclusive access to the queue when asked, -
-            because there are other consumers active - it MUST raise a channel exception
-            with return code 405 (resource locked).
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <method name = "consume-ok" synchronous = "1" index = "21" label = "confirm a new consumer">
-      <doc>
-        This method provides the client with a consumer tag which it MUST use in methods
-        that work with the consumer.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>Holds the consumer tag specified by the client or provided by the server.</doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "cancel" synchronous = "1" index = "30" label = "end a queue consumer">
-      <doc>
-        This method cancels a consumer. This does not affect already delivered messages, but
-        it does mean the server will not send any more messages for that consumer.
-      </doc>
-
-      <response name = "cancel-ok" />
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <method name = "cancel-ok" synchronous = "1" index = "31" label = "confirm a cancelled consumer">
-      <doc>This method confirms that the cancellation was completed.</doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "open" synchronous = "1" index = "40" label = "request to start staging">
-      <doc>
-        This method requests permission to start staging a message. Staging means sending
-        the message into a temporary area at the recipient end and then delivering the
-        message by referring to this temporary area. Staging is how the protocol handles
-        partial file transfers - if a message is partially staged and the connection breaks,
-        the next time the sender starts to stage it, it can restart from where it left off.
-      </doc>
-
-      <response name = "open-ok" />
-
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "identifier" domain = "shortstr" label = "staging identifier">
-        <doc>
-          This is the staging identifier. This is an arbitrary string chosen by the
-          sender. For staging to work correctly the sender must use the same staging
-          identifier when staging the same message a second time after recovery from a
-          failure. A good choice for the staging identifier would be the SHA1 hash of the
-          message properties data (including the original filename, revised time, etc.).
-        </doc>
-      </field>
-      
-      <field name = "content-size" domain = "longlong" label = "message content size">
-        <doc>
-          The size of the content in octets. The recipient may use this information to
-          allocate or check available space in advance, to avoid "disk full" errors during
-          staging of very large messages.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The sender MUST accurately fill the content-size field. Zero-length content
-            is permitted.
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <method name = "open-ok" synchronous = "1" index = "41" label = "confirm staging ready">
-      <doc>
-        This method confirms that the recipient is ready to accept staged data. If the
-        message was already partially-staged at a previous time the recipient will report
-        the number of octets already staged.
-      </doc>
-      
-      <response name = "stage" />
-      
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "staged-size" domain = "longlong" label = "already staged amount">
-        <doc>
-          The amount of previously-staged content in octets. For a new message this will
-          be zero.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The sender MUST start sending data from this octet offset in the message,
-            counting from zero.
-          </doc>
-        </rule>
-        
-        <rule name = "02">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The recipient MAY decide how long to hold partially-staged content and MAY
-            implement staging by always discarding partially-staged content. However if
-            it uses the file content type it MUST support the staging methods.
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "stage" content = "1" index = "50" label = "stage message content">
-      <doc>
-        This method stages the message, sending the message content to the recipient from
-        the octet offset specified in the Open-Ok method.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "publish" index = "60" label = "publish a message">
-      <doc>
-        This method publishes a staged file message to a specific exchange. The file message
-        will be routed to queues as defined by the exchange configuration and distributed to
-        any active consumers when the transaction, if any, is committed.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "write" access rights
-            to the access realm for the exchange.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange to publish to. The exchange name can be
-          empty, meaning the default exchange. If the exchange name is specified, and that
-          exchange does not exist, the server will raise a channel exception.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The server MUST accept a blank exchange name to mean the default exchange.
-          </doc>
-        </rule>
-        
-        <rule name = "02">
-          <doc>
-            If the exchange was declared as an internal exchange, the server MUST
-            respond with a reply code 403 (access refused) and raise a channel
-            exception.
-          </doc>
-        </rule>
-        
-        <!-- TODO: Rule split? -->
-        
-        <rule name = "03">
-          <doc>
-            The exchange MAY refuse file content in which case it MUST respond with a
-            reply code 540 (not implemented) and raise a channel exception.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key for the message. The routing key is used for routing
-          messages depending on the exchange configuration.
-        </doc>
-      </field>
-      
-      <field name = "mandatory" domain = "bit" label = "indicate mandatory routing">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue. If this flag is set, the server will return an unroutable message with a
-          Return method. If this flag is zero, the server silently drops the message.
-        </doc>
-        
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the mandatory flag.</doc>
-        </rule>
-      </field>
-      
-      <field name = "immediate" domain = "bit" label = "request immediate delivery">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue consumer immediately. If this flag is set, the server will return an
-          undeliverable message with a Return method. If this flag is zero, the server
-          will queue the message, but with no guarantee that it will ever be consumed.
-        </doc>
-                
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the immediate flag.</doc>
-        </rule>
-      </field>
-      
-      <field name = "identifier" domain = "shortstr" label = "staging identifier">
-        <doc>
-          This is the staging identifier of the message to publish. The message must have
-          been staged. Note that a client can send the Publish method asynchronously
-          without waiting for staging to finish.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "return" content = "1" index = "70" label = "return a failed message">
-      <doc>
-        This method returns an undeliverable message that was published with the "immediate"
-        flag set, or an unroutable message published with the "mandatory" flag set. The
-        reply code and text provide information about the reason that the message was
-        undeliverable.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "reply-code" domain = "reply-code" />
-      
-      <field name = "reply-text" domain = "reply-text" />
-      
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "deliver" index = "80" label = "notify the client of a consumer message">
-      <doc>
-        This method delivers a staged file message to the client, via a consumer. In the
-        asynchronous message delivery model, the client starts a consumer using the Consume
-        method, then the server responds with Deliver methods as and when messages arrive
-        for that consumer.
-      </doc>
-      
-      <rule name = "01">
-        <!-- TODO: Rule split? -->
-        <doc>
-          The server SHOULD track the number of times a message has been delivered to
-          clients and when a message is redelivered a certain number of times - e.g. 5
-          times - without being acknowledged, the server SHOULD consider the message to be
-          unprocessable (possibly causing client applications to abort), and move the
-          message to a dead letter queue.
-        </doc>
-      </rule>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "consumer-tag" domain = "consumer-tag" />
-      
-      <field name = "delivery-tag" domain = "delivery-tag" />
-      
-      <field name = "redelivered" domain = "redelivered" />
-      
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-      
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-      
-      <field name = "identifier" domain = "shortstr" label = "staging identifier">
-        <doc>
-          This is the staging identifier of the message to deliver. The message must have
-          been staged. Note that a server can send the Deliver method asynchronously
-          without waiting for staging to finish.
-        </doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "ack" index = "90" label = "acknowledge one or more messages">
-      <doc>
-        This method acknowledges one or more messages delivered via the Deliver method. The
-        client can ask to confirm a single message or a set of messages up to and including
-        a specific message.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <field name = "delivery-tag" domain = "delivery-tag" />
-      
-      <field name = "multiple" domain = "bit" label = "acknowledge multiple messages">
-        <doc>
-          If set to 1, the delivery tag is treated as "up to and including", so that the
-          client can acknowledge multiple messages with a single method. If set to zero,
-          the delivery tag refers to a single message. If the multiple field is 1, and the
-          delivery tag is zero, tells the server to acknowledge all outstanding mesages.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The server MUST validate that a non-zero delivery-tag refers to an delivered
-            message, and raise a channel exception if this is not the case.
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "reject" index = "100" label = "reject an incoming message">
-      <doc>
-        This method allows a client to reject a message. It can be used to return
-        untreatable messages to their original queue. Note that file content is staged
-        before delivery, so the client will not use this method to interrupt delivery of a
-        large message.
-      </doc>
-      
-      <rule name = "01">
-        <doc>
-          The server SHOULD interpret this method as meaning that the client is unable to
-          process the message at this time.
-        </doc>
-      </rule>
-      
-      <!-- TODO: Rule split? -->
-      
-      <rule name = "02">
-        <doc>
-          A client MUST NOT use this method as a means of selecting messages to process. A
-          rejected message MAY be discarded or dead-lettered, not necessarily passed to
-          another client.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <field name = "delivery-tag" domain = "delivery-tag" />
-      
-      <field name = "requeue" domain = "bit" label = "requeue the message">
-        <doc>
-          If this field is zero, the message will be discarded. If this bit is 1, the
-          server will attempt to requeue the message.
-        </doc>
-        
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MUST NOT deliver the message to the same client within the
-            context of the current channel. The recommended strategy is to attempt to
-            deliver the message to an alternative consumer, and if that is not possible,
-            to move the message to a dead-letter queue. The server MAY use more
-            sophisticated tracking to hold the message on the queue and redeliver it to
-            the same client at a later stage.
-          </doc>
-        </rule>
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  STREAM  =========================================================== -->
-
-  <class name = "stream" handler = "channel" index = "80" label = "work with streaming content">
-    <doc>
-      The stream class provides methods that support multimedia streaming. The stream class
-      uses the following semantics: one message is one packet of data; delivery is
-      unacknowleged and unreliable; the consumer can specify quality of service parameters
-      that the server can try to adhere to; lower-priority messages may be discarded in favour
-      of high priority messages.
-    </doc>
-    
-    <doc type = "grammar">
-      stream              = C:QOS S:QOS-OK
-                          / C:CONSUME S:CONSUME-OK
-                          / C:CANCEL S:CANCEL-OK
-                          / C:PUBLISH content
-                          / S:RETURN
-                          / S:DELIVER content
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <rule name = "01">
-      <doc>
-        The server SHOULD discard stream messages on a priority basis if the queue size
-        exceeds some configured limit.
-      </doc>
-    </rule>
-    
-    <rule name = "02">
-      <!-- TODO: Rule split? -->
-      <doc>
-        The server MUST implement at least 2 priority levels for stream messages, where
-        priorities 0-4 and 5-9 are treated as two distinct levels. The server MAY implement
-        up to 10 priority levels.
-      </doc>
-    </rule>
-    
-    <rule name = "03">
-      <doc>
-        The server MUST implement automatic acknowledgements on stream content. That is, as
-        soon as a message is delivered to a client via a Deliver method, the server must
-        remove it from the queue.
-      </doc>
-    </rule>
-    
-    <!--  These are the properties for a Stream content  -->
-
-    <field name = "content-type"    domain = "shortstr"   label = "MIME content type" />
-    <field name = "content-encoding" domain = "shortstr"  label = "MIME content encoding" />
-    <field name = "headers"         domain = "table"      label = "message header field table" />
-    <field name = "priority"        domain = "octet"      label = "message priority, 0 to 9" />
-    <field name = "timestamp"       domain = "timestamp"  label = "message timestamp" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "qos" synchronous = "1" index = "10" label = "specify quality of service">
-      <doc>
-        This method requests a specific quality of service. The QoS can be specified for the
-        current channel or for all channels on the connection. The particular properties and
-        semantics of a qos method always depend on the content class semantics. Though the
-        qos method could in principle apply to both peers, it is currently meaningful only
-        for the server.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "qos-ok" />
-      
-      <field name = "prefetch-size" domain = "long" label = "prefetch window in octets">
-        <doc>
-          The client can request that messages be sent in advance so that when the client
-          finishes processing a message, the following message is already held locally,
-          rather than needing to be sent down the channel. Prefetching gives a performance
-          improvement. This field specifies the prefetch window size in octets. May be set
-          to zero, meaning "no specific limit". Note that other prefetch limits may still
-          apply.
-        </doc>
-      </field>
-      
-      <field name = "prefetch-count" domain = "short" label = "prefetch window in messages">
-        <doc>
-          Specifies a prefetch window in terms of whole messages. This field may be used
-          in combination with the prefetch-size field; a message will only be sent in
-          advance if both prefetch windows (and those at the channel and connection level)
-          allow it.
-        </doc>
-      </field>
-      
-      <field name = "consume-rate" domain = "long" label = "transfer rate in octets/second">
-        <doc>
-          Specifies a desired transfer rate in octets per second. This is usually
-          determined by the application that uses the streaming data. A value of zero
-          means "no limit", i.e. as rapidly as possible.
-        </doc>
-
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MAY ignore the prefetch values and consume rates, depending on
-            the type of stream and the ability of the server to queue and/or reply it.
-            The server MAY drop low-priority messages in favour of high-priority
-            messages.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "global" domain = "bit" label = "apply to entire connection">
-        <doc>
-          By default the QoS settings apply to the current channel only. If this field is
-          set, they are applied to the entire connection.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "qos-ok" synchronous = "1" index = "11" label = "confirm the requested qos">
-      <doc>
-        This method tells the client that the requested QoS levels could be handled by the
-        server. The requested QoS applies to all active consumers until a new QoS is
-        defined.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "consume" synchronous = "1" index = "20" label = "start a queue consumer">
-      <doc>
-        This method asks the server to start a "consumer", which is a transient request for
-        messages from a specific queue. Consumers last as long as the channel they were
-        created on, or until the client cancels them.
-      </doc>
-
-      <rule name = "01">
-        <doc>
-          The server SHOULD support at least 16 consumers per queue, unless the queue was
-          declared as private, and ideally, impose no limit except as defined by available
-          resources.
-        </doc>
-      </rule>
-
-      <rule name = "02">
-        <doc>
-          Streaming applications SHOULD use different channels to select different
-          streaming resolutions. AMQP makes no provision for filtering and/or transforming
-          streams except on the basis of priority-based selective delivery of individual
-          messages.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "consume-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Specifies the identifier for the consumer. The consumer tag is local to a
-          connection, so two clients can use the same consumer tags. If this field is
-          empty the server will generate a unique tag.
-        </doc>
-
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The tag MUST NOT refer to an existing consumer. If the client attempts to
-            create two consumers with the same non-empty tag the server MUST raise a
-            connection exception with reply code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "no-local" domain = "no-local" />
-
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive consumer access, meaning only this consumer can access the
-          queue.
-        </doc>
-
-
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>
-            If the server cannot grant exclusive access to the queue when asked, -
-            because there are other consumers active - it MUST raise a channel exception
-            with return code 405 (resource locked).
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "consume-ok" synchronous = "1" index = "21" label = "confirm a new consumer">
-      <doc>
-        This method provides the client with a consumer tag which it may use in methods that
-        work with the consumer.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>Holds the consumer tag specified by the client or provided by the server.</doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "cancel" synchronous = "1" index = "30" label = "end a queue consumer">
-      <doc>
-        This method cancels a consumer. Since message delivery is asynchronous the client
-        may continue to receive messages for a short while after canceling a consumer. It
-        may process or discard these as appropriate.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <response name = "cancel-ok" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <method name = "cancel-ok" synchronous = "1" index = "31" label = "confirm a cancelled consumer">
-      <doc>This method confirms that the cancellation was completed.</doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "publish" content = "1" index = "40" label = "publish a message">
-      <doc>
-        This method publishes a message to a specific exchange. The message will be routed
-        to queues as defined by the exchange configuration and distributed to any active
-        consumers as appropriate.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "write" access rights
-            to the access realm for the exchange.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange to publish to. The exchange name can be
-          empty, meaning the default exchange. If the exchange name is specified, and that
-          exchange does not exist, the server will raise a channel exception.
-        </doc>
-
-        <rule name = "01">
-          <doc>
-            The server MUST accept a blank exchange name to mean the default exchange.
-          </doc>
-        </rule>
-
-        <rule name = "02">
-          <doc>
-            If the exchange was declared as an internal exchange, the server MUST
-            respond with a reply code 403 (access refused) and raise a channel
-            exception.
-          </doc>
-        </rule>
-
-        <rule name = "03">
-          <doc>
-            The exchange MAY refuse stream content in which case it MUST respond with a
-            reply code 540 (not implemented) and raise a channel exception.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key for the message. The routing key is used for routing
-          messages depending on the exchange configuration.
-        </doc>
-      </field>
-
-      <field name = "mandatory" domain = "bit" label = "indicate mandatory routing">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue. If this flag is set, the server will return an unroutable message with a
-          Return method. If this flag is zero, the server silently drops the message.
-        </doc>
-
-        <!-- Rule test name: was "amq_stream_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the mandatory flag.</doc>
-        </rule>
-      </field>
-
-      <field name = "immediate" domain = "bit" label = "request immediate delivery">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue consumer immediately. If this flag is set, the server will return an
-          undeliverable message with a Return method. If this flag is zero, the server
-          will queue the message, but with no guarantee that it will ever be consumed.
-        </doc>
-
-        <!-- Rule test name: was "amq_stream_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the immediate flag.</doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "return" content = "1" index = "50" label = "return a failed message">
-      <doc>
-        This method returns an undeliverable message that was published with the "immediate"
-        flag set, or an unroutable message published with the "mandatory" flag set. The
-        reply code and text provide information about the reason that the message was
-        undeliverable.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "reply-code" domain = "reply-code" />
-
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "deliver" content = "1" index = "60"
-      label = "notify the client of a consumer message">
-      <doc>
-        This method delivers a message to the client, via a consumer. In the asynchronous
-        message delivery model, the client starts a consumer using the Consume method, then
-        the server responds with Deliver methods as and when messages arrive for that
-        consumer.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue that the message came from. Note that a single
-          channel can start many consumers on different queues.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  TX  =============================================================== -->
-
-  <class name = "tx" handler = "channel" index = "90" label = "work with standard transactions">
-    <doc>
-      Standard transactions provide so-called "1.5 phase commit". We can ensure that work is
-      never lost, but there is a chance of confirmations being lost, so that messages may be
-      resent. Applications that use standard transactions must be able to detect and ignore
-      duplicate messages.
-    </doc>
-
-    <!-- TODO: Rule split? -->
-
-    <rule name = "01">
-      <doc>
-        An client using standard transactions SHOULD be able to track all messages received
-        within a reasonable period, and thus detect and reject duplicates of the same
-        message. It SHOULD NOT pass these to the application layer.
-      </doc>
-    </rule>
-
-    <doc type = "grammar">
-      tx                  = C:SELECT S:SELECT-OK
-                          / C:COMMIT S:COMMIT-OK
-                          / C:ROLLBACK S:ROLLBACK-OK
-    </doc>
-
-    <chassis name = "server" implement = "SHOULD" />
-    <chassis name = "client" implement = "MAY" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "select" synchronous = "1" index = "10" label = "select standard transaction mode">
-      <doc>
-        This method sets the channel to use standard transactions. The client must use this
-        method at least once on a channel before using the Commit or Rollback methods.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "select-ok" />
-    </method>
-
-    <method name = "select-ok" synchronous = "1" index = "11" label = "confirm transaction mode">
-      <doc>
-        This method confirms to the client that the channel was successfully set to use
-        standard transactions.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "commit" synchronous = "1" index = "20" label = "commit the current transaction">
-      <doc>
-        This method commits all messages published and acknowledged in the current
-        transaction. A new transaction starts immediately after a commit.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "commit-ok" />
-    </method>
-
-    <method name = "commit-ok" synchronous = "1" index = "21" label = "confirm a successful commit">
-      <doc>
-        This method confirms to the client that the commit succeeded. Note that if a commit
-        fails, the server raises a channel exception.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "rollback" synchronous = "1" index = "30"
-      label = "abandon the current transaction">
-      <doc>
-        This method abandons all messages published and acknowledged in the current
-        transaction. A new transaction starts immediately after a rollback.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "rollback-ok" />
-    </method>
-
-    <method name = "rollback-ok" synchronous = "1" index = "31" label = "confirm successful rollback">
-      <doc>
-        This method confirms to the client that the rollback succeeded. Note that if an
-        rollback fails, the server raises a channel exception.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  DTX  ============================================================== -->
-
-  <class name = "dtx" handler = "channel" index = "100" label = "work with distributed transactions">
-    <doc>
-      Distributed transactions provide so-called "2-phase commit". The AMQP distributed
-      transaction model supports the X-Open XA architecture and other distributed transaction
-      implementations. The Dtx class assumes that the server has a private communications
-      channel (not AMQP) to a distributed transaction coordinator.
-    </doc>
-    
-    <doc type = "grammar">
-      dtx                 = C:SELECT S:SELECT-OK
-                            C:START S:START-OK
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "select" synchronous = "1" index = "10" label = "select standard transaction mode">
-      <doc>
-        This method sets the channel to use distributed transactions. The client must use
-        this method at least once on a channel before using the Start method.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "select-ok" />
-    </method>
-
-    <method name = "select-ok" synchronous = "1" index = "11" label = "confirm transaction mode">
-      <doc>
-        This method confirms to the client that the channel was successfully set to use
-        distributed transactions.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "start" synchronous = "1" index = "20"
-      label = "start a new distributed transaction">
-      <doc>
-        This method starts a new distributed transaction. This must be the first method on a
-        new channel that uses the distributed transaction mode, before any methods that
-        publish or consume messages.
-      </doc>
-      <chassis name = "server" implement = "MAY" />
-      <response name = "start-ok" />
-      <field name = "dtx-identifier" domain = "shortstr" label = "transaction identifier">
-        <doc>
-          The distributed transaction key. This identifies the transaction so that the
-          AMQP server can coordinate with the distributed transaction coordinator.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <method name = "start-ok" synchronous = "1" index = "21"
-      label = "confirm the start of a new distributed transaction">
-      <doc>
-        This method confirms to the client that the transaction started. Note that if a
-        start fails, the server raises a channel exception.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  TUNNEL  =========================================================== -->
-
-  <class name = "tunnel" handler = "tunnel" index = "110" label = "methods for protocol tunneling">
-    <doc>
-      The tunnel methods are used to send blocks of binary data - which can be serialised AMQP
-      methods or other protocol frames - between AMQP peers.
-    </doc>
-
-    <doc type = "grammar">
-      tunnel              = C:REQUEST
-                          / S:REQUEST
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <field name = "headers"     domain = "table"      label = "message header field table" />
-    <field name = "proxy-name"  domain = "shortstr"   label = "identity of tunnelling proxy" />
-    <field name = "data-name"   domain = "shortstr"   label = "name or type of message being tunnelled" />
-    <field name = "durable"     domain = "octet"      label = "message durability indicator" />
-    <field name = "broadcast"   domain = "octet"      label = "message broadcast mode" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "request" content = "1" index = "10" label = "sends a tunnelled method">
-      <doc>
-        This method tunnels a block of binary data, which can be an encoded
-        AMQP method or other data. The binary data is sent as the content for
-        the Tunnel.Request method.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <field name = "meta-data" domain = "table" label = "meta data for the tunnelled block">
-        <doc>
-          This field table holds arbitrary meta-data that the sender needs to
-          pass to the recipient.
-        </doc>
-      </field>
-    </method>
-  </class>
-</amqp>
diff --git a/cpp/gentools/xml-src/amqp-0.8.test.xml b/cpp/gentools/xml-src/amqp-0.8.test.xml
deleted file mode 100644
index b0adf31828..0000000000
--- a/cpp/gentools/xml-src/amqp-0.8.test.xml
+++ /dev/null
@@ -1,3959 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-	Copyright Notice
-	================
-	(c) Copyright JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc.,
-	iMatix Corporation, IONA\ufffd Technologies, Red Hat, Inc.,
-	TWIST Process Innovations, and 29West Inc. 2006. All rights reserved.
-	
-	License
-	=======
-	JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix 
-	Corporation, IONA\ufffd Technologies, Red Hat, Inc., TWIST Process Innovations, and 
-	29West Inc. (collectively, the "Authors") each hereby grants to you a worldwide,
-	perpetual, royalty-free, nontransferable, nonexclusive license to
-	(i) copy, display, and implement the Advanced Messaging Queue Protocol
-	("AMQP") Specification and (ii) the Licensed Claims that are held by
-	the Authors, all for the purpose of implementing the Advanced Messaging
-	Queue Protocol Specification. Your license and any rights under this
-	Agreement will terminate immediately without notice from
-	any Author if you bring any claim, suit, demand, or action related to
-	the Advanced Messaging Queue Protocol Specification against any Author.
-	Upon termination, you shall destroy all copies of the Advanced Messaging
-	Queue Protocol Specification in your possession or control.
-	
-	As used hereunder, "Licensed Claims" means those claims of a patent or
-	patent application, throughout the world, excluding design patents and
-	design registrations, owned or controlled, or that can be sublicensed
-	without fee and in compliance with the requirements of this
-	Agreement, by an Author or its affiliates now or at any
-	future time and which would necessarily be infringed by implementation
-	of the Advanced Messaging Queue Protocol Specification. A claim is
-	necessarily infringed hereunder only when it is not possible to avoid
-	infringing it because there is no plausible non-infringing alternative
-	for implementing the required portions of the Advanced Messaging Queue
-	Protocol Specification. Notwithstanding the foregoing, Licensed Claims
-	shall not include any claims other than as set forth above even if
-	contained in the same patent as Licensed Claims; or that read solely
-	on any implementations of any portion of the Advanced Messaging Queue
-	Protocol Specification that are not required by the Advanced Messaging
-	Queue Protocol Specification, or that, if licensed, would require a
-	payment of royalties by the licensor to unaffiliated third parties.
-	Moreover, Licensed Claims shall not include (i) any enabling technologies
-	that may be necessary to make or use any Licensed Product but are not
-	themselves expressly set forth in the Advanced Messaging Queue Protocol
-	Specification (e.g., semiconductor manufacturing technology, compiler
-	technology, object oriented technology, networking technology, operating
-	system technology, and the like); or (ii) the implementation of other
-	published standards developed elsewhere and merely referred to in the
-	body of the Advanced Messaging Queue Protocol Specification, or
-	(iii) any Licensed Product and any combinations thereof the purpose or
-	function of which is not required for compliance with the Advanced
-	Messaging Queue Protocol Specification. For purposes of this definition,
-	the Advanced Messaging Queue Protocol Specification shall be deemed to
-	include both architectural and interconnection requirements essential
-	for interoperability and may also include supporting source code artifacts
-	where such architectural, interconnection requirements and source code
-	artifacts are expressly identified as being required or documentation to
-	achieve compliance with the Advanced Messaging Queue Protocol Specification.
-	
-	As used hereunder, "Licensed Products" means only those specific portions
-	of products (hardware, software or combinations thereof) that implement
-	and are compliant with all relevant portions of the Advanced Messaging
-	Queue Protocol Specification.
-	
-	The following disclaimers, which you hereby also acknowledge as to any
-	use you may make of the Advanced Messaging Queue Protocol Specification:
-	
-	THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS,"
-	AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-	IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
-	CONTENTS OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE
-	SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF THE ADVANCED
-	MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD PARTY 
-	PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-	
-	THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-	INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-	USE, IMPLEMENTATION OR DISTRIBUTION OF THE ADVANCED MESSAGING QUEUE
-	PROTOCOL SPECIFICATION.
-	
-	The name and trademarks of the Authors may NOT be used in any manner,
-	including advertising or publicity pertaining to the Advanced Messaging
-	Queue Protocol Specification or its contents without specific, written
-	prior permission. Title to copyright in the Advanced Messaging Queue
-	Protocol Specification will at all times remain with the Authors.
-	
-	No other rights are granted by implication, estoppel or otherwise.
-	
-	Upon termination of your license or rights under this Agreement, you
-	shall destroy all copies of the Advanced Messaging Queue Protocol
-	Specification in your possession or control.
-	
-	Trademarks
-	==========
-	"JPMorgan", "JPMorgan Chase", "Chase", the JPMorgan Chase logo and the
-	Octagon Symbol are trademarks of JPMorgan Chase & Co.
-	
-	IMATIX and the iMatix logo are trademarks of iMatix Corporation sprl.
-	
-	IONA, IONA Technologies, and the IONA logos are trademarks of IONA
-	Technologies PLC and/or its subsidiaries.
-	
-	LINUX is a trademark of Linus Torvalds. RED HAT and JBOSS are registered
-	trademarks of Red Hat, Inc. in the US and other countries.
-	
-	Java, all Java-based trademarks and OpenOffice.org are trademarks of
-	Sun Microsystems, Inc. in the United States, other countries, or both.
-	
-	Other company, product, or service names may be trademarks or service
-	marks of others.
-	
-	Links to full AMQP specification:
-	=================================
-	http://www.envoytech.org/spec/amq/
-	http://www.iona.com/opensource/amqp/
-	http://www.redhat.com/solutions/specifications/amqp/
-	http://www.twiststandards.org/tiki-index.php?page=AMQ
-	http://www.imatix.com/amqp
-	
--->
-
-<!--
-========================================================
-EDITORS: (PH)   Pieter Hintjens <ph@imatix.com>
-         (KvdR) Kim van der Riet <kim.vdriet@redhat.com>
-
-NOTE: These editors have been assigned by the AMQP working group. Please do not
-edit/commit this file without consulting with one of the above editors.
-========================================================
-
-Revision history:
-    2006-06-07 (PH) - version number changed to 0.8 to conform to public
-    release documentation.
-
-    2006-05-15 (PH) - fixed comments on queue name in basic.get to clarify
-    use of current queue in this method.
-
-    2006-05-15 (PH) - fixed comments on routing key in queue.bind to clarify
-    how routing key is filled when empty (to allow asynch queue.declare).
-
-    2006-05-11 (PH) - reset version to 0.70 so that putatitive standards
-    group can release 2-3 major new versions before hitting 1.0 (again).
-
-    2006-05-11 (PH) - TODO in documentation: cycle field in frame header
-    has been removed.
-
-    2006-05-11 (PH) - added nowait option to exchange.declare, delete,
-    queue.declare, delete, bind, purge, basic.consume, cancel,
-    file.consume, cancel, stream.consume and cancel methods.
-
-    2006-05-11 (PH) - removed notnull rule and added explanations on queue
-    name in queue.bind, purge, delete, basic.consume, cancel, file.consume,
-    cancel, stream.consume and cancel methods.
-
-    2006-05-11 (PH) - added basic.qos, file.qos, and stream.qos methods that
-    regroup all prefetch options from the consume methods.  Also removed the
-    prefetch option from channel.open.
-
-    2006-05-11 (PH) - renumbered method indexes to show request-response
-    nature of methods; requests are 10, 20, 30 while responses are 11, 21,
-    etc.
-
-    2006-05-11 (PH) - removed OpenAMQ extension methods from this definition
-    since these are maintained seperately.
-    
-    2006-05-26 (RG) - added Basic.Recover method to allow replay of
-    unacknowledged messages on a channel.
-
-    2006-07-03 (PH) - cosmetic clean-up of Basic.Recover comments.
--->
-
-<amqp major="8" minor="0" port="5672" comment="AMQ protocol 0.80">
-    AMQ Protocol 0.80
-
-<!--
-======================================================
-==       CONSTANTS
-======================================================
--->
-  <constant name="frame method" value="1"/>
-  <constant name="frame header" value="2"/>
-  <constant name="frame body" value="3"/>
-  <constant name="frame oob method" value="4"/>
-  <constant name="frame oob header" value="5"/>
-  <constant name="frame oob body" value="6"/>
-  <constant name="frame trace" value="7"/>
-  <constant name="frame heartbeat" value="8"/>
-  <constant name="frame min size" value="4096"/>
-  <constant name="frame end" value="206"/>
-  <constant name="reply success" value="200">
-  Indicates that the method completed successfully. This reply code is
-  reserved for future use - the current protocol design does not use
-  positive confirmation and reply codes are sent only in case of an
-  error.
-</constant>
-  <constant name="not delivered" value="310" class="soft error">
-  The client asked for a specific message that is no longer available.
-  The message was delivered to another client, or was purged from the
-  queue for some other reason.
-</constant>
-  <constant name="content too large" value="311" class="soft error">
-  The client attempted to transfer content larger than the server
-  could accept at the present time.  The client may retry at a later
-  time.
-</constant>
-  <constant name="connection forced" value="320" class="hard error">
-  An operator intervened to close the connection for some reason.
-  The client may retry at some later date.
-</constant>
-  <constant name="invalid path" value="402" class="hard error">
-  The client tried to work with an unknown virtual host or cluster.
-</constant>
-  <constant name="access refused" value="403" class="soft error">
-  The client attempted to work with a server entity to which it has
-  no  due to security settings.
-</constant>
-  <constant name="not found" value="404" class="soft error">
-  The client attempted to work with a server entity that does not exist.
-</constant>
-  <constant name="resource locked" value="405" class="soft error">
-  The client attempted to work with a server entity to which it has
-  no access because another client is working with it.
-</constant>
-  <constant name="frame error" value="501" class="hard error">
-  The client sent a malformed frame that the server could not decode.
-  This strongly implies a programming error in the client.
-</constant>
-  <constant name="syntax error" value="502" class="hard error">
-  The client sent a frame that contained illegal values for one or more
-  fields.  This strongly implies a programming error in the client.
-</constant>
-  <constant name="command invalid" value="503" class="hard error">
-  The client sent an invalid sequence of frames, attempting to perform
-  an operation that was considered invalid by the server. This usually
-  implies a programming error in the client.
-</constant>
-  <constant name="channel error" value="504" class="hard error">
-  The client attempted to work with a channel that had not been
-  correctly opened.  This most likely indicates a fault in the client
-  layer.
-</constant>
-  <constant name="resource error" value="506" class="hard error">
-  The server could not complete the method because it lacked sufficient
-  resources. This may be due to the client creating too many of some
-  type of entity.
-</constant>
-  <constant name="not allowed" value="530" class="hard error">
-  The client tried to work with some entity in a manner that is
-  prohibited by the server, due to security settings or by some other
-  criteria.
-</constant>
-  <constant name="not implemented" value="540" class="hard error">
-  The client tried to use functionality that is not implemented in the
-  server.
-</constant>
-  <constant name="internal error" value="541" class="hard error">
-  The server could not complete the method because of an internal error.
-  The server may require intervention by an operator in order to resume
-  normal operations.
-</constant>
-  <!--
-======================================================
-==       DOMAIN TYPES
-======================================================
--->
-  <domain name="access ticket" type="short">
-    access ticket granted by server
-    <doc>
-    An access ticket granted by the server for a certain set of access
-    rights within a specific realm. Access tickets are valid within the
-    channel where they were created, and expire when the channel closes.
-    </doc>
-    <assert check="ne" value="0"/>
-  </domain>
-  <domain name="class id" type="short"/>
-  <domain name="consumer tag" type="shortstr">
-    consumer tag
-    <doc>
-      Identifier for the consumer, valid within the current connection.
-    </doc>
-    <rule implement="MUST">
-      The consumer tag is valid only within the channel from which the
-      consumer was created. I.e. a client MUST NOT create a consumer in
-      one channel and then use it in another.
-    </rule>
-  </domain>
-  <domain name="delivery tag" type="longlong">
-    server-assigned delivery tag
-    <doc>
-      The server-assigned and channel-specific delivery tag
-    </doc>
-    <rule implement="MUST">
-      The delivery tag is valid only within the channel from which the
-      message was received.  I.e. a client MUST NOT receive a message on
-      one channel and then acknowledge it on another.
-    </rule>
-    <rule implement="MUST">
-      The server MUST NOT use a zero value for delivery tags.  Zero is
-      reserved for client use, meaning "all messages so far received".
-    </rule>
-  </domain>
-  <domain name="exchange name" type="shortstr">
-    exchange name
-    <doc>
-      The exchange name is a client-selected string that identifies
-      the exchange for publish methods.  Exchange names may consist
-      of any mixture of digits, letters, and underscores.  Exchange
-      names are scoped by the virtual host.
-    </doc>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="known hosts" type="shortstr">
-list of known hosts
-<doc>
-Specifies the list of equivalent or alternative hosts that the server
-knows about, which will normally include the current server itself.
-Clients can cache this information and use it when reconnecting to a
-server after a failure.
-</doc>
-    <rule implement="MAY">
-The server MAY leave this field empty if it knows of no other
-hosts than itself.
-</rule>
-  </domain>
-  <domain name="method id" type="short"/>
-  <domain name="no ack" type="bit">
-    no acknowledgement needed
-    <doc>
-      If this field is set the server does not expect acknowledgments
-      for messages.  That is, when a message is delivered to the client
-      the server automatically and silently acknowledges it on behalf
-      of the client.  This functionality increases performance but at
-      the cost of reliability.  Messages can get lost if a client dies
-      before it can deliver them to the application.
-    </doc>
-  </domain>
-  <domain name="no local" type="bit">
-    do not deliver own messages
-    <doc>
-    If the no-local field is set the server will not send messages to
-    the client that published them.
-    </doc>
-  </domain>
-  <domain name="path" type="shortstr">
-    <doc>
-  Must start with a slash "/" and continue with path names
-  separated by slashes. A path name consists of any combination
-  of at least one of [A-Za-z0-9] plus zero or more of [.-_+!=:].
-</doc>
-    <assert check="notnull"/>
-    <assert check="syntax" rule="path"/>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="peer properties" type="table">
-    <doc>
-This string provides a set of peer properties, used for
-identification, debugging, and general information.
-</doc>
-    <rule implement="SHOULD">
-The properties SHOULD contain these fields:
-"product", giving the name of the peer product, "version", giving
-the name of the peer version, "platform", giving the name of the
-operating system, "copyright", if appropriate, and "information",
-giving other general information.
-</rule>
-  </domain>
-  <domain name="queue name" type="shortstr">
-    queue name
-    <doc>
-    The queue name identifies the queue within the vhost.  Queue
-    names may consist of any mixture of digits, letters, and
-    underscores.
-    </doc>
-    <assert check="length" value="127"/>
-  </domain>
-  <domain name="redelivered" type="bit">
-    message is being redelivered
-    <doc>
-      This indicates that the message has been previously delivered to
-      this or another client.
-    </doc>
-    <rule implement="SHOULD">
-      The server SHOULD try to signal redelivered messages when it can.
-      When redelivering a message that was not successfully acknowledged,
-      the server SHOULD deliver it to the original client if possible.
-    </rule>
-    <rule implement="MUST">
-      The client MUST NOT rely on the redelivered field but MUST take it
-      as a hint that the message may already have been processed.  A
-      fully robust client must be able to track duplicate received messages
-      on non-transacted, and locally-transacted channels.
-    </rule>
-  </domain>
-  <domain name="reply code" type="short">
-reply code from server
-<doc>
-  The reply code. The AMQ reply codes are defined in AMQ RFC 011.
-</doc>
-    <assert check="notnull"/>
-  </domain>
-  <domain name="reply text" type="shortstr">
-localised reply text
-<doc>
-  The localised reply text.  This text can be logged as an aid to
-  resolving issues.
-</doc>
-    <assert check="notnull"/>
-  </domain>
-  <class name="connection" handler="connection" index="10">
-    <!--
-======================================================
-==       CONNECTION
-======================================================
--->
-  work with socket connections
-<doc>
-  The connection class provides methods for a client to establish a
-  network connection to a server, and for both peers to operate the
-  connection thereafter.
-</doc>
-    <doc name="grammar">
-    connection          = open-connection *use-connection close-connection
-    open-connection     = C:protocol-header
-                          S:START C:START-OK
-                          *challenge
-                          S:TUNE C:TUNE-OK
-                          C:OPEN S:OPEN-OK | S:REDIRECT
-    challenge           = S:SECURE C:SECURE-OK
-    use-connection      = *channel
-    close-connection    = C:CLOSE S:CLOSE-OK
-                        / S:CLOSE C:CLOSE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="start" synchronous="1" index="10">
-  start connection negotiation
-  <doc>
-    This method starts the connection negotiation process by telling
-    the client the protocol version that the server proposes, along
-    with a list of security mechanisms which the client can use for
-    authentication.
-  </doc>
-      <rule implement="MUST">
-    If the client cannot handle the protocol version suggested by the
-    server it MUST close the socket connection.
-  </rule>
-      <rule implement="MUST">
-    The server MUST provide a protocol version that is lower than or
-    equal to that requested by the client in the protocol header. If
-    the server cannot support the specified protocol it MUST NOT send
-    this method, but MUST close the socket connection.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <response name="start-ok"/>
-      <field name="version major" type="octet">
-    protocol major version
-    <doc>
-      The protocol major version that the server agrees to use, which
-      cannot be higher than the client's major version.
-    </doc>
-      </field>
-      <field name="version minor" type="octet">
-    protocol major version
-    <doc>
-      The protocol minor version that the server agrees to use, which
-      cannot be higher than the client's minor version.
-    </doc>
-      </field>
-      <field name="server properties" domain="peer properties">
-    server properties
-  </field>
-      <field name="mechanisms" type="longstr">
-    available security mechanisms
-    <doc>
-      A list of the security mechanisms that the server supports, delimited
-      by spaces.  Currently ASL supports these mechanisms: PLAIN.
-    </doc>
-        <see name="security mechanisms"/>
-        <assert check="notnull"/>
-      </field>
-      <field name="locales" type="longstr">
-    available message locales
-    <doc>
-      A list of the message locales that the server supports, delimited
-      by spaces.  The locale defines the language in which the server
-      will send reply texts.
-    </doc>
-        <rule implement="MUST">
-      All servers MUST support at least the en_US locale.
-    </rule>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="start-ok" synchronous="1" index="11">
-  select security mechanism and locale
-  <doc>
-    This method selects a SASL security mechanism. ASL uses SASL
-    (RFC2222) to negotiate authentication and encryption.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="client properties" domain="peer properties">
-    client properties
-  </field>
-      <field name="mechanism" type="shortstr">
-    selected security mechanism
-    <doc>
-      A single security mechanisms selected by the client, which must be
-      one of those specified by the server.
-    </doc>
-        <rule implement="SHOULD">
-      The client SHOULD authenticate using the highest-level security
-      profile it can handle from the list provided by the server.
-    </rule>
-        <rule implement="MUST">
-    The mechanism field MUST contain one of the security mechanisms
-    proposed by the server in the Start method. If it doesn't, the
-    server MUST close the socket.
-    </rule>
-        <assert check="notnull"/>
-      </field>
-      <field name="response" type="longstr">
-    security response data
-    <doc>
-      A block of opaque data passed to the security mechanism. The contents
-      of this data are defined by the SASL security mechanism.  For the
-      PLAIN security mechanism this is defined as a field table holding
-      two fields, LOGIN and PASSWORD.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-      <field name="locale" type="shortstr">
-    selected message locale
-    <doc>
-      A single message local selected by the client, which must be one
-      of those specified by the server.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="secure" synchronous="1" index="20">
-  security mechanism challenge
-  <doc>
-    The SASL protocol works by exchanging challenges and responses until
-    both peers have received sufficient information to authenticate each
-    other.  This method challenges the client to provide more information.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <response name="secure-ok"/>
-      <field name="challenge" type="longstr">
-    security challenge data
-    <doc>
-      Challenge information, a block of opaque binary data passed to
-      the security mechanism.
-    </doc>
-        <see name="security mechanisms"/>
-      </field>
-    </method>
-    <method name="secure-ok" synchronous="1" index="21">
-  security mechanism response
-  <doc>
-    This method attempts to authenticate, passing a block of SASL data
-    for the security mechanism at the server side.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="response" type="longstr">
-    security response data
-    <doc>
-      A block of opaque data passed to the security mechanism.  The contents
-      of this data are defined by the SASL security mechanism.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="tune" synchronous="1" index="30">
-  propose connection tuning parameters
-  <doc>
-    This method proposes a set of connection configuration values
-    to the client.  The client can accept and/or adjust these.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <response name="tune-ok"/>
-      <field name="channel max" type="short">
-    proposed maximum channels
-    <doc>
-      The maximum total number of channels that the server allows
-      per connection. Zero means that the server does not impose a
-      fixed limit, but the number of allowed channels may be limited
-      by available server resources.
-    </doc>
-      </field>
-      <field name="frame max" type="long">
-    proposed maximum frame size
-    <doc>
-      The largest frame size that the server proposes for the
-      connection. The client can negotiate a lower value.  Zero means
-      that the server does not impose any specific limit but may reject
-      very large frames if it cannot allocate resources for them.
-    </doc>
-        <rule implement="MUST">
-      Until the frame-max has been negotiated, both peers MUST accept
-      frames of up to 4096 octets large. The minimum non-zero value for
-      the frame-max field is 4096.
-    </rule>
-      </field>
-      <field name="heartbeat" type="short">
-    desired heartbeat delay
-    <doc>
-      The delay, in seconds, of the connection heartbeat that the server
-      wants.  Zero means the server does not want a heartbeat.
-    </doc>
-      </field>
-    </method>
-    <method name="tune-ok" synchronous="1" index="31">
-  negotiate connection tuning parameters
-  <doc>
-    This method sends the client's connection tuning parameters to the
-    server. Certain fields are negotiated, others provide capability
-    information.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="channel max" type="short">
-    negotiated maximum channels
-    <doc>
-      The maximum total number of channels that the client will use
-      per connection.  May not be higher than the value specified by
-      the server.
-    </doc>
-        <rule implement="MAY">
-      The server MAY ignore the channel-max value or MAY use it for
-      tuning its resource allocation.
-    </rule>
-        <assert check="notnull"/>
-        <assert check="le" method="tune" field="channel max"/>
-      </field>
-      <field name="frame max" type="long">
-    negotiated maximum frame size
-    <doc>
-      The largest frame size that the client and server will use for
-      the connection.  Zero means that the client does not impose any
-      specific limit but may reject very large frames if it cannot
-      allocate resources for them.  Note that the frame-max limit
-      applies principally to content frames, where large contents
-      can be broken into frames of arbitrary size.
-    </doc>
-        <rule implement="MUST">
-      Until the frame-max has been negotiated, both peers must accept
-      frames of up to 4096 octets large. The minimum non-zero value for
-      the frame-max field is 4096.
-    </rule>
-      </field>
-      <field name="heartbeat" type="short">
-    desired heartbeat delay
-    <doc>
-      The delay, in seconds, of the connection heartbeat that the client
-      wants. Zero means the client does not want a heartbeat.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="open" synchronous="1" index="40">
-  open connection to virtual host
-  <doc>
-    This method opens a connection to a virtual host, which is a
-    collection of resources, and acts to separate multiple application
-    domains within a server.
-  </doc>
-      <rule implement="MUST">
-    The client MUST open the context before doing any work on the
-    connection.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="open-ok"/>
-      <response name="redirect"/>
-      <field name="virtual host" domain="path">
-    virtual host name
-    <assert check="regexp" value="^[a-zA-Z0-9/-_]+$"/>
-        <doc>
-      The name of the virtual host to work with.
-    </doc>
-        <rule implement="MUST">
-      If the server supports multiple virtual hosts, it MUST enforce a
-      full separation of exchanges, queues, and all associated entities
-      per virtual host. An application, connected to a specific virtual
-      host, MUST NOT be able to access resources of another virtual host.
-    </rule>
-        <rule implement="SHOULD">
-      The server SHOULD verify that the client has permission to access
-      the specified virtual host.
-    </rule>
-        <rule implement="MAY">
-      The server MAY configure arbitrary limits per virtual host, such
-      as the number of each type of entity that may be used, per
-      connection and/or in total.
-    </rule>
-      </field>
-      <field name="capabilities" type="shortstr">
-    required capabilities
-    <doc>
-      The client may specify a number of capability names, delimited by
-      spaces.  The server can use this string to how to process the
-      client's connection request.
-    </doc>
-      </field>
-      <field name="insist" type="bit">
-    insist on connecting to server
-    <doc>
-      In a configuration with multiple load-sharing servers, the server
-      may respond to a Connection.Open method with a Connection.Redirect.
-      The insist option tells the server that the client is insisting on
-      a connection to the specified server.
-    </doc>
-        <rule implement="SHOULD">
-      When the client uses the insist option, the server SHOULD accept
-      the client connection unless it is technically unable to do so.
-    </rule>
-      </field>
-    </method>
-    <method name="open-ok" synchronous="1" index="41">
-  signal that the connection is ready
-  <doc>
-    This method signals to the client that the connection is ready for
-    use.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="known hosts" domain="known hosts"/>
-    </method>
-    <method name="redirect" synchronous="1" index="50">
-  asks the client to use a different server
-  <doc>
-    This method redirects the client to another server, based on the
-    requested virtual host and/or capabilities.
-  </doc>
-      <rule implement="SHOULD">
-    When getting the Connection.Redirect method, the client SHOULD
-    reconnect to the host specified, and if that host is not present,
-    to any of the hosts specified in the known-hosts list.
-  </rule>
-      <chassis name="client" implement="MAY"/>
-      <field name="host" type="shortstr">
-    server to connect to
-    <doc>
-      Specifies the server to connect to.  This is an IP address or a
-      DNS name, optionally followed by a colon and a port number. If
-      no port number is specified, the client should use the default
-      port number for the protocol.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-      <field name="known hosts" domain="known hosts"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="close" synchronous="1" index="60">
-  request a connection close
-  <doc>
-    This method indicates that the sender wants to close the connection.
-    This may be due to internal conditions (e.g. a forced shut-down) or
-    due to an error handling a specific method, i.e. an exception.  When
-    a close is due to an exception, the sender provides the class and
-    method id of the method which caused the exception.
-  </doc>
-      <rule implement="MUST">
-    After sending this method any received method except the Close-OK
-    method MUST be discarded.
-  </rule>
-      <rule implement="MAY">
-    The peer sending this method MAY use a counter or timeout to
-    detect failure of the other peer to respond correctly with
-    the Close-OK method.
-  </rule>
-      <rule implement="MUST">
-    When a server receives the Close method from a client it MUST
-    delete all server-side resources associated with the client's
-    context.  A client CANNOT reconnect to a context after sending
-    or receiving a Close method.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="close-ok"/>
-      <field name="reply code" domain="reply code"/>
-      <field name="reply text" domain="reply text"/>
-      <field name="class id" domain="class id">
-    failing method class
-    <doc>
-      When the close is provoked by a method exception, this is the
-      class of the method.
-    </doc>
-      </field>
-      <field name="method id" domain="class id">
-    failing method ID
-    <doc>
-      When the close is provoked by a method exception, this is the
-      ID of the method.
-    </doc>
-      </field>
-    </method>
-    <method name="close-ok" synchronous="1" index="61">
-  confirm a connection close
-  <doc>
-    This method confirms a Connection.Close method and tells the
-    recipient that it is safe to release resources for the connection
-    and close the socket.
-  </doc>
-      <rule implement="SHOULD">
-    A peer that detects a socket closure without having received a
-    Close-Ok handshake method SHOULD log the error.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-    </method>
-  </class>
-  <class name="channel" handler="channel" index="20">
-    <!--
-======================================================
-==       CHANNEL
-======================================================
--->
-  work with channels
-<doc>
-  The channel class provides methods for a client to establish a virtual
-  connection - a channel - to a server and for both peers to operate the
-  virtual connection thereafter.
-</doc>
-    <doc name="grammar">
-    channel             = open-channel *use-channel close-channel
-    open-channel        = C:OPEN S:OPEN-OK
-    use-channel         = C:FLOW S:FLOW-OK
-                        / S:FLOW C:FLOW-OK
-                        / S:ALERT
-                        / functional-class
-    close-channel       = C:CLOSE S:CLOSE-OK
-                        / S:CLOSE C:CLOSE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="open" synchronous="1" index="10">
-  open a channel for use
-  <doc>
-    This method opens a virtual connection (a channel).
-  </doc>
-      <rule implement="MUST">
-    This method MUST NOT be called when the channel is already open.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="open-ok"/>
-      <field name="out of band" type="shortstr">
-    out-of-band settings
-    <doc>
-      Configures out-of-band transfers on this channel.  The syntax and
-      meaning of this field will be formally defined at a later date.
-    </doc>
-        <assert check="null"/>
-      </field>
-    </method>
-    <method name="open-ok" synchronous="1" index="11">
-  signal that the channel is ready
-  <doc>
-    This method signals to the client that the channel is ready for use.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="flow" synchronous="1" index="20">
-  enable/disable flow from peer
-  <doc>
-    This method asks the peer to pause or restart the flow of content
-    data. This is a simple flow-control mechanism that a peer can use
-    to avoid oveflowing its queues or otherwise finding itself receiving
-    more messages than it can process.  Note that this method is not
-    intended for window control.  The peer that receives a request to
-    stop sending content should finish sending the current content, if
-    any, and then wait until it receives a Flow restart method.
-  </doc>
-      <rule implement="MAY">
-    When a new channel is opened, it is active.  Some applications
-    assume that channels are inactive until started.  To emulate this
-    behaviour a client MAY open the channel, then pause it.
-  </rule>
-      <rule implement="SHOULD">
-    When sending content data in multiple frames, a peer SHOULD monitor
-    the channel for incoming methods and respond to a Channel.Flow as
-    rapidly as possible.
-  </rule>
-      <rule implement="MAY">
-    A peer MAY use the Channel.Flow method to throttle incoming content
-    data for internal reasons, for example, when exchangeing data over a
-    slower connection.
-  </rule>
-      <rule implement="MAY">
-    The peer that requests a Channel.Flow method MAY disconnect and/or
-    ban a peer that does not respect the request.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <response name="flow-ok"/>
-      <field name="active" type="bit">
-    start/stop content frames
-    <doc>
-      If 1, the peer starts sending content frames.  If 0, the peer
-      stops sending content frames.
-    </doc>
-      </field>
-    </method>
-    <method name="flow-ok" index="21">
-  confirm a flow method
-  <doc>
-    Confirms to the peer that a flow command was received and processed.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <chassis name="client" implement="MUST"/>
-      <field name="active" type="bit">
-    current flow setting
-    <doc>
-      Confirms the setting of the processed flow method: 1 means the
-      peer will start sending or continue to send content frames; 0
-      means it will not.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="alert" index="30">
-  send a non-fatal warning message
-  <doc>
-    This method allows the server to send a non-fatal warning to the
-    client.  This is used for methods that are normally asynchronous
-    and thus do not have confirmations, and for which the server may
-    detect errors that need to be reported.  Fatal errors are handled
-    as channel or connection exceptions; non-fatal errors are sent
-    through this method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="reply code" domain="reply code"/>
-      <field name="reply text" domain="reply text"/>
-      <field name="details" type="table">
-    detailed information for warning
-    <doc>
-      A set of fields that provide more information about the
-      problem.  The meaning of these fields are defined on a
-      per-reply-code basis (TO BE DEFINED).
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="close" synchronous="1" index="40">
-  request a channel close
-  <doc>
-    This method indicates that the sender wants to close the channel.
-    This may be due to internal conditions (e.g. a forced shut-down) or
-    due to an error handling a specific method, i.e. an exception.  When
-    a close is due to an exception, the sender provides the class and
-    method id of the method which caused the exception.
-  </doc>
-      <rule implement="MUST">
-    After sending this method any received method except
-    Channel.Close-OK MUST be discarded.
-  </rule>
-      <rule implement="MAY">
-    The peer sending this method MAY use a counter or timeout to detect
-    failure of the other peer to respond correctly with Channel.Close-OK..
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="close-ok"/>
-      <field name="reply code" domain="reply code"/>
-      <field name="reply text" domain="reply text"/>
-      <field name="class id" domain="class id">
-    failing method class
-    <doc>
-      When the close is provoked by a method exception, this is the
-      class of the method.
-    </doc>
-      </field>
-      <field name="method id" domain="method id">
-    failing method ID
-    <doc>
-      When the close is provoked by a method exception, this is the
-      ID of the method.
-    </doc>
-      </field>
-    </method>
-    <method name="close-ok" synchronous="1" index="41">
-  confirm a channel close
-  <doc>
-    This method confirms a Channel.Close method and tells the recipient
-    that it is safe to release resources for the channel and close the
-    socket.
-  </doc>
-      <rule implement="SHOULD">
-    A peer that detects a socket closure without having received a
-    Channel.Close-Ok handshake method SHOULD log the error.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-    </method>
-  </class>
-  <class name="access" handler="connection" index="30">
-    <!--
-======================================================
-==      ACCESS CONTROL
-======================================================
--->
-  work with access tickets
-<doc>
-  The protocol control access to server resources using access tickets.
-  A client must explicitly request access tickets before doing work.
-  An access ticket grants a client the right to use a specific set of
-  resources - called a "realm" - in specific ways.
-</doc>
-    <doc name="grammar">
-    access              = C:REQUEST S:REQUEST-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="request" synchronous="1" index="10">
-  request an access ticket
-  <doc>
-    This method requests an access ticket for an access realm.
-    The server responds by granting the access ticket.  If the
-    client does not have access rights to the requested realm
-    this causes a connection exception.  Access tickets are a
-    per-channel resource.
-  </doc>
-      <rule implement="MUST">
-    The realm name MUST start with either "/data" (for application
-    resources) or "/admin" (for server administration resources).
-    If the realm starts with any other path, the server MUST raise
-    a connection exception with reply code 403 (access refused).
-  </rule>
-      <rule implement="MUST">
-    The server MUST implement the /data realm and MAY implement the
-    /admin realm.  The mapping of resources to realms is not
-    defined in the protocol - this is a server-side configuration
-    issue.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="request-ok"/>
-      <field name="realm" domain="path">
-    name of requested realm
-    <rule implement="MUST">
-      If the specified realm is not known to the server, the server
-      must raise a channel exception with reply code 402 (invalid
-      path).
-    </rule>
-      </field>
-      <field name="exclusive" type="bit">
-    request exclusive access
-    <doc>
-      Request exclusive access to the realm. If the server cannot grant
-      this - because there are other active tickets for the realm - it
-      raises a channel exception.
-    </doc>
-      </field>
-      <field name="passive" type="bit">
-    request passive access
-    <doc>
-      Request message passive access to the specified access realm.
-      Passive access lets a client get information about resources in
-      the realm but not to make any changes to them.
-    </doc>
-      </field>
-      <field name="active" type="bit">
-    request active access
-    <doc>
-      Request message active access to the specified access realm.
-      Acvtive access lets a client get create and delete resources in
-      the realm.
-    </doc>
-      </field>
-      <field name="write" type="bit">
-    request write access
-    <doc>
-      Request write access to the specified access realm.  Write access
-      lets a client publish messages to all exchanges in the realm.
-    </doc>
-      </field>
-      <field name="read" type="bit">
-    request read access
-    <doc>
-      Request read access to the specified access realm.  Read access
-      lets a client consume messages from queues in the realm.
-    </doc>
-      </field>
-    </method>
-    <method name="request-ok" synchronous="1" index="11">
-  grant access to server resources
-  <doc>
-    This method provides the client with an access ticket. The access
-    ticket is valid within the current channel and for the lifespan of
-    the channel.
-  </doc>
-      <rule implement="MUST">
-    The client MUST NOT use access tickets except within the same
-    channel as originally granted.
-  </rule>
-      <rule implement="MUST">
-    The server MUST isolate access tickets per channel and treat an
-    attempt by a client to mix these as a connection exception.
-  </rule>
-      <chassis name="client" implement="MUST"/>
-      <field name="ticket" domain="access ticket"/>
-    </method>
-  </class>
-  <class name="exchange" handler="channel" index="40">
-    <!--
-======================================================
-==       EXCHANGES (or "routers", if you prefer)
-==       (Or matchers, plugins, extensions, agents,... Routing is just one of
-==        the many fun things an exchange can do.)
-======================================================
--->
-  work with exchanges
-<doc>
-  Exchanges match and distribute messages across queues.  Exchanges can be
-  configured in the server or created at runtime.
-</doc>
-    <doc name="grammar">
-    exchange            = C:DECLARE  S:DECLARE-OK
-                        / C:DELETE   S:DELETE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <rule implement="MUST">
-      <test>amq_exchange_19</test>
-  The server MUST implement the direct and fanout exchange types, and
-  predeclare the corresponding exchanges named amq.direct and amq.fanout
-  in each virtual host. The server MUST also predeclare a direct
-  exchange to act as the default exchange for content Publish methods
-  and for default queue bindings.
-</rule>
-    <rule implement="SHOULD">
-      <test>amq_exchange_20</test>
-  The server SHOULD implement the topic exchange type, and predeclare
-  the corresponding exchange named amq.topic in each virtual host.
-</rule>
-    <rule implement="MAY">
-      <test>amq_exchange_21</test>
-  The server MAY implement the system exchange type, and predeclare the
-  corresponding exchanges named amq.system in each virtual host. If the
-  client attempts to bind a queue to the system exchange, the server
-  MUST raise a connection exception with reply code 507 (not allowed).
-</rule>
-    <rule implement="MUST">
-      <test>amq_exchange_22</test>
-  The default exchange MUST be defined as internal, and be inaccessible
-  to the client except by specifying an empty exchange name in a content
-  Publish method. That is, the server MUST NOT let clients make explicit
-  bindings to this exchange.
-</rule>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="declare" synchronous="1" index="10">
-  declare exchange, create if needed
-  <doc>
-    This method creates an exchange if it does not already exist, and if the
-    exchange exists, verifies that it is of the correct and expected class.
-  </doc>
-      <rule implement="SHOULD">
-        <test>amq_exchange_23</test>
-    The server SHOULD support a minimum of 16 exchanges per virtual host
-    and ideally, impose no limit except as defined by available resources.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="declare-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      When a client defines a new exchange, this belongs to the access realm
-      of the ticket used.  All further work done with that exchange must be
-      done with an access ticket for the same realm.
-    </doc>
-        <rule implement="MUST">
-      The client MUST provide a valid access ticket giving "active" access
-      to the realm in which the exchange exists or will be created, or
-      "passive" access if the if-exists flag is set.
-    </rule>
-      </field>
-      <field name="exchange" domain="exchange name">
-        <rule implement="MUST">
-          <test>amq_exchange_15</test>
-      Exchange names starting with "amq." are reserved for predeclared
-      and standardised exchanges.  If the client attempts to create an
-      exchange starting with "amq.", the server MUST raise a channel
-      exception with reply code 403 (access refused).
-    </rule>
-        <assert check="regexp" value="^[a-zA-Z0-9-_.:]+$"/>
-      </field>
-      <field name="type" type="shortstr">
-    exchange type
-    <doc>
-      Each exchange belongs to one of a set of exchange types implemented
-      by the server.  The exchange types define the functionality of the
-      exchange - i.e. how messages are routed through it.  It is not valid
-      or meaningful to attempt to change the type of an existing exchange.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_exchange_16</test>
-      If the exchange already exists with a different type, the server
-      MUST raise a connection exception with a reply code 507 (not allowed).
-    </rule>
-        <rule implement="MUST">
-          <test>amq_exchange_18</test>
-      If the server does not support the requested exchange type it MUST
-      raise a connection exception with a reply code 503 (command invalid).
-    </rule>
-        <assert check="regexp" value="^[a-zA-Z0-9-_.:]+$"/>
-      </field>
-      <field name="passive" type="bit">
-    do not create exchange
-    <doc>
-    If set, the server will not create the exchange.  The client can use
-    this to check whether an exchange exists without modifying the server
-    state.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_exchange_05</test>
-      If set, and the exchange does not already exist, the server MUST
-      raise a channel exception with reply code 404 (not found).
-    </rule>
-      </field>
-      <field name="durable" type="bit">
-    request a durable exchange
-    <doc>
-      If set when creating a new exchange, the exchange will be marked as
-      durable.  Durable exchanges remain active when a server restarts.
-      Non-durable exchanges (transient exchanges) are purged if/when a
-      server restarts.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_exchange_24</test>
-      The server MUST support both durable and transient exchanges.
-    </rule>
-        <rule implement="MUST">
-      The server MUST ignore the durable field if the exchange already
-      exists.
-    </rule>
-      </field>
-      <field name="auto delete" type="bit">
-    auto-delete when unused
-    <doc>
-      If set, the exchange is deleted when all queues have finished
-      using it.
-    </doc>
-        <rule implement="SHOULD">
-          <test>amq_exchange_02</test>
-      The server SHOULD allow for a reasonable delay between the point
-      when it determines that an exchange is not being used (or no longer
-      used), and the point when it deletes the exchange.  At the least it
-      must allow a client to create an exchange and then bind a queue to
-      it, with a small but non-zero delay between these two actions.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_exchange_25</test>
-      The server MUST ignore the auto-delete field if the exchange already
-      exists.
-    </rule>
-      </field>
-      <field name="internal" type="bit">
-    create internal exchange
-    <doc>
-      If set, the exchange may not be used directly by publishers, but
-      only when bound to other exchanges. Internal exchanges are used to
-      construct wiring that is not visible to applications.
-    </doc>
-      </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-      <field name="arguments" type="table">
-    arguments for declaration
-    <doc>
-      A set of arguments for the declaration. The syntax and semantics
-      of these arguments depends on the server implementation.  This
-      field is ignored if passive is 1.
-    </doc>
-      </field>
-    </method>
-    <method name="declare-ok" synchronous="1" index="11">
-  confirms an exchange declaration
-  <doc>
-    This method confirms a Declare method and confirms the name of the
-    exchange, essential for automatically-named exchanges.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="delete" synchronous="1" index="20">
-  delete an exchange
-  <doc>
-    This method deletes an exchange.  When an exchange is deleted all queue
-    bindings on the exchange are cancelled.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="delete-ok"/>
-      <field name="ticket" domain="access ticket">
-        <rule implement="MUST">
-      The client MUST provide a valid access ticket giving "active"
-      access rights to the exchange's access realm.
-    </rule>
-      </field>
-      <field name="exchange" domain="exchange name">
-        <rule implement="MUST">
-          <test>amq_exchange_11</test>
-      The exchange MUST exist. Attempting to delete a non-existing exchange
-      causes a channel exception.
-    </rule>
-        <assert check="notnull"/>
-      </field>
-      <field name="if unused" type="bit">
-    delete only if unused
-    <doc>
-      If set, the server will only delete the exchange if it has no queue
-      bindings. If the exchange has queue bindings the server does not
-      delete it but raises a channel exception instead.
-    </doc>
-        <rule implement="SHOULD">
-          <test>amq_exchange_12</test>
-      If set, the server SHOULD delete the exchange but only if it has
-      no queue bindings.
-    </rule>
-        <rule implement="SHOULD">
-          <test>amq_exchange_13</test>
-      If set, the server SHOULD raise a channel exception if the exchange is in
-      use.
-    </rule>
-      </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-    </method>
-    <method name="delete-ok" synchronous="1" index="21">
-  confirm deletion of an exchange
-  <doc>
-    This method confirms the deletion of an exchange.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="queue" handler="channel" index="50">
-    <!--
-======================================================
-==       QUEUES
-======================================================
--->
-  work with queues
-
-<doc>
-  Queues store and forward messages.  Queues can be configured in the server
-  or created at runtime.  Queues must be attached to at least one exchange
-  in order to receive messages from publishers.
-</doc>
-    <doc name="grammar">
-    queue               = C:DECLARE  S:DECLARE-OK
-                        / C:BIND     S:BIND-OK
-                        / C:PURGE    S:PURGE-OK
-                        / C:DELETE   S:DELETE-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="MUST"/>
-    <rule implement="MUST">
-      <test>amq_queue_33</test>
-  A server MUST allow any content class to be sent to any queue, in any
-  mix, and queue and delivery these content classes independently. Note
-  that all methods that fetch content off queues are specific to a given
-  content class.
-</rule>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="declare" synchronous="1" index="10">
-  declare queue, create if needed
-  <doc>
-    This method creates or checks a queue.  When creating a new queue
-    the client can specify various properties that control the durability
-    of the queue and its contents, and the level of sharing for the queue.
-  </doc>
-      <rule implement="MUST">
-        <test>amq_queue_34</test>
-    The server MUST create a default binding for a newly-created queue
-    to the default exchange, which is an exchange of type 'direct'.
-  </rule>
-      <rule implement="SHOULD">
-        <test>amq_queue_35</test>
-    The server SHOULD support a minimum of 256 queues per virtual host
-    and ideally, impose no limit except as defined by available resources.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="declare-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      When a client defines a new queue, this belongs to the access realm
-      of the ticket used.  All further work done with that queue must be
-      done with an access ticket for the same realm.
-    </doc>
-        <doc>
-      The client provides a valid access ticket giving "active" access
-      to the realm in which the queue exists or will be created, or
-      "passive" access if the if-exists flag is set.
-    </doc>
-      </field>
-      <field name="queue" domain="queue name">
-        <rule implement="MAY">
-          <test>amq_queue_10</test>
-      The queue name MAY be empty, in which case the server MUST create
-      a new queue with a unique generated name and return this to the
-      client in the Declare-Ok method.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_32</test>
-      Queue names starting with "amq." are reserved for predeclared and
-      standardised server queues.  If the queue name starts with "amq."
-      and the passive option is zero, the server MUST raise a connection
-      exception with reply code 403 (access refused).
-    </rule>
-        <assert check="regexp" value="^[a-zA-Z0-9-_.:]*$"/>
-      </field>
-      <field name="passive" type="bit">
-    do not create queue
-    <doc>
-    If set, the server will not create the queue.  The client can use
-    this to check whether a queue exists without modifying the server
-    state.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_05</test>
-      If set, and the queue does not already exist, the server MUST
-      respond with a reply code 404 (not found) and raise a channel
-      exception.
-    </rule>
-      </field>
-      <field name="durable" type="bit">
-    request a durable queue
-    <doc>
-      If set when creating a new queue, the queue will be marked as
-      durable.  Durable queues remain active when a server restarts.
-      Non-durable queues (transient queues) are purged if/when a
-      server restarts.  Note that durable queues do not necessarily
-      hold persistent messages, although it does not make sense to
-      send persistent messages to a transient queue.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_03</test>
-      The server MUST recreate the durable queue after a restart.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_36</test>
-      The server MUST support both durable and transient queues.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_37</test>
-      The server MUST ignore the durable field if the queue already
-      exists.
-    </rule>
-      </field>
-      <field name="exclusive" type="bit">
-    request an exclusive queue
-    <doc>
-      Exclusive queues may only be consumed from by the current connection.
-      Setting the 'exclusive' flag always implies 'auto-delete'.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_38</test>
-      The server MUST support both exclusive (private) and non-exclusive
-      (shared) queues.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_04</test>
-      The server MUST raise a channel exception if 'exclusive' is specified
-      and the queue already exists and is owned by a different connection.
-    </rule>
-      </field>
-      <field name="auto delete" type="bit">
-    auto-delete queue when unused
-    <doc>
-      If set, the queue is deleted when all consumers have finished
-      using it. Last consumer can be cancelled either explicitly or because
-      its channel is closed. If there was no consumer ever on the queue, it
-      won't be deleted.
-    </doc>
-        <rule implement="SHOULD">
-          <test>amq_queue_02</test>
-      The server SHOULD allow for a reasonable delay between the point
-      when it determines that a queue is not being used (or no longer
-      used), and the point when it deletes the queue.  At the least it
-      must allow a client to create a queue and then create a consumer
-      to read from it, with a small but non-zero delay between these
-      two actions.  The server should equally allow for clients that may
-      be disconnected prematurely, and wish to re-consume from the same
-      queue without losing messages.  We would recommend a configurable
-      timeout, with a suitable default value being one minute.
-    </rule>
-        <rule implement="MUST">
-          <test>amq_queue_31</test>
-      The server MUST ignore the auto-delete field if the queue already
-      exists.
-    </rule>
-      </field>
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-      <field name="arguments" type="table">
-    arguments for declaration
-    <doc>
-      A set of arguments for the declaration. The syntax and semantics
-      of these arguments depends on the server implementation.  This
-      field is ignored if passive is 1.
-    </doc>
-      </field>
-    </method>
-    <method name="declare-ok" synchronous="1" index="11">
-  confirms a queue definition
-  <doc>
-    This method confirms a Declare method and confirms the name of the
-    queue, essential for automatically-named queues.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="queue" domain="queue name">
-        <doc>
-      Reports the name of the queue. If the server generated a queue
-      name, this field contains that name.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-      <field name="message count" type="long">
-    number of messages in queue
-    <doc>
-      Reports the number of messages in the queue, which will be zero
-      for newly-created queues.
-    </doc>
-      </field>
-      <field name="consumer count" type="long">
-    number of consumers
-    <doc>
-      Reports the number of active consumers for the queue. Note that
-      consumers can suspend activity (Channel.Flow) in which case they
-      do not appear in this count.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="bind" synchronous="1" index="20">
-  bind queue to an exchange
-  <doc>
-    This method binds a queue to an exchange.  Until a queue is
-    bound it will not receive any messages.  In a classic messaging
-    model, store-and-forward queues are bound to a dest exchange
-    and subscription queues are bound to a dest_wild exchange.
-  </doc>
-      <rule implement="MUST">
-        <test>amq_queue_25</test>
-    A server MUST allow ignore duplicate bindings - that is, two or
-    more bind methods for a specific queue, with identical arguments
-    - without treating these as an error.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_39</test>
-    If a bind fails, the server MUST raise a connection exception.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_12</test>
-    The server MUST NOT allow a durable queue to bind to a transient
-    exchange. If the client attempts this the server MUST raise a
-    channel exception.
-  </rule>
-      <rule implement="SHOULD">
-        <test>amq_queue_13</test>
-    Bindings for durable queues are automatically durable and the
-    server SHOULD restore such bindings after a server restart.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_17</test>
-    If the client attempts to an exchange that was declared as internal,
-    the server MUST raise a connection exception with reply code 530
-    (not allowed).
-  </rule>
-      <rule implement="SHOULD">
-        <test>amq_queue_40</test>
-    The server SHOULD support at least 4 bindings per queue, and
-    ideally, impose no limit except as defined by available resources.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="bind-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      The client provides a valid access ticket giving "active"
-      access rights to the queue's access realm.
-    </doc>
-      </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to bind.  If the queue name is
-      empty, refers to the current queue for the channel, which is
-      the last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue
-      name in this method is empty, the server MUST raise a connection
-      exception with reply code 530 (not allowed).
-    </doc>
-    <doc name = "rule" test = "amq_queue_26">
-      If the queue does not exist the server MUST raise a channel exception
-      with reply code 404 (not found).
-    </doc>
-  </field>
-
-  <field name="exchange" domain="exchange name">
-          The name of the exchange to bind to.
-          <rule implement="MUST">
-          <test>amq_queue_14</test>
-      If the exchange does not exist the server MUST raise a channel
-      exception with reply code 404 (not found).
-    </rule>
-      </field>
-      <field name="routing key" type="shortstr">
-     message routing key
-    <doc>
-      Specifies the routing key for the binding.  The routing key is
-      used for routing messages depending on the exchange configuration.
-      Not all exchanges use a routing key - refer to the specific
-      exchange documentation.  If the routing key is empty and the queue
-      name is empty, the routing key will be the current queue for the
-      channel, which is the last declared queue.
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-
-  <field name="arguments" type="table">
-    arguments for binding
-    <doc>
-      A set of arguments for the binding.  The syntax and semantics of
-      these arguments depends on the exchange class.
-    </doc>
-      </field>
-    </method>
-    <method name="bind-ok" synchronous="1" index="21">
-  confirm bind successful
-  <doc>
-    This method confirms that the bind was successful.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="purge" synchronous="1" index="30">
-  purge a queue
-  <doc>
-    This method removes all messages from a queue.  It does not cancel
-    consumers.  Purged messages are deleted without any formal "undo"
-    mechanism.
-  </doc>
-      <rule implement="MUST">
-        <test>amq_queue_15</test>
-    A call to purge MUST result in an empty queue.
-  </rule>
-      <rule implement="MUST">
-        <test>amq_queue_41</test>
-    On transacted channels the server MUST not purge messages that have
-    already been sent to a client but not yet acknowledged.
-  </rule>
-      <rule implement="MAY">
-        <test>amq_queue_42</test>
-    The server MAY implement a purge queue or log that allows system
-    administrators to recover accidentally-purged messages.  The server
-    SHOULD NOT keep purged messages in the same storage spaces as the
-    live messages since the volumes of purged messages may get very
-    large.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="purge-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      The access ticket must be for the access realm that holds the
-      queue.
-    </doc>
-        <rule implement="MUST">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the queue's access realm.  Note that purging a queue is
-      equivalent to reading all messages and discarding them.
-    </rule>
-      </field>
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to purge.  If the queue name is
-      empty, refers to the current queue for the channel, which is
-      the last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue
-      name in this method is empty, the server MUST raise a connection
-      exception with reply code 530 (not allowed).
-    </doc>
-    <doc name = "rule" test = "amq_queue_16">
-      The queue must exist. Attempting to purge a non-existing queue
-      causes a channel exception.
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-    </method>
-    <method name="purge-ok" synchronous="1" index="31">
-  confirms a queue purge
-  <doc>
-    This method confirms the purge of a queue.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="message count" type="long">
-    number of messages purged
-    <doc>
-      Reports the number of messages purged.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="delete" synchronous="1" index="40">
-  delete a queue
-  <doc>
-    This method deletes a queue.  When a queue is deleted any pending
-    messages are sent to a dead-letter queue if this is defined in the
-    server configuration, and all consumers on the queue are cancelled.
-  </doc>
-      <rule implement="SHOULD">
-        <test>amq_queue_43</test>
-    The server SHOULD use a dead-letter queue to hold messages that
-    were pending on a deleted queue, and MAY provide facilities for
-    a system administrator to move these messages back to an active
-    queue.
-  </rule>
-      <chassis name="server" implement="MUST"/>
-      <response name="delete-ok"/>
-      <field name="ticket" domain="access ticket">
-        <doc>
-      The client provides a valid access ticket giving "active"
-      access rights to the queue's access realm.
-    </doc>
-      </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to delete. If the queue name is
-      empty, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue
-      name in this method is empty, the server MUST raise a connection
-      exception with reply code 530 (not allowed).
-    </doc>
-    <doc name = "rule" test = "amq_queue_21">
-      The queue must exist. Attempting to delete a non-existing queue
-      causes a channel exception.
-    </doc>
-  </field>
-
-      <field name="if unused" type="bit">
-    delete only if unused
-    <doc>
-      If set, the server will only delete the queue if it has no
-      consumers. If the queue has consumers the server does does not
-      delete it but raises a channel exception instead.
-    </doc>
-        <rule implement="MUST">
-          <test>amq_queue_29</test>
-          <test>amq_queue_30</test>
-      The server MUST respect the if-unused flag when deleting a queue.
-    </rule>
-      </field>
-      <field name="if empty" type="bit">
-    delete only if empty
-	<test>amq_queue_27</test>
-        <doc>
-      If set, the server will only delete the queue if it has no
-      messages. If the queue is not empty the server raises a channel
-      exception.
-    </doc>
-      </field>
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-    </method>
-
-    <method name="delete-ok" synchronous="1" index="41">
-  confirm deletion of a queue
-  <doc>
-    This method confirms the deletion of a queue.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <field name="message count" type="long">
-    number of messages purged
-    <doc>
-      Reports the number of messages purged.
-    </doc>
-      </field>
-    </method>
-  </class>
-  <class name="basic" handler="channel" index="60">
-    <!--
-======================================================
-==       BASIC MIDDLEWARE
-======================================================
--->
-  work with basic content
-<doc>
-  The Basic class provides methods that support an industry-standard
-  messaging model.
-</doc>
-
-<doc name = "grammar">
-    basic               = C:QOS S:QOS-OK
-                        / C:CONSUME S:CONSUME-OK
-                        / C:CANCEL S:CANCEL-OK
-                        / C:PUBLISH content
-                        / S:RETURN content
-                        / S:DELIVER content
-                        / C:GET ( S:GET-OK content / S:GET-EMPTY )
-                        / C:ACK
-                        / C:REJECT
-</doc>
-
-<chassis name = "server" implement = "MUST" />
-<chassis name = "client" implement = "MAY"  />
-
-<doc name = "rule" test = "amq_basic_08">
-  The server SHOULD respect the persistent property of basic messages
-  and SHOULD make a best-effort to hold persistent basic messages on a
-  reliable storage mechanism.
-</doc>
-<doc name = "rule" test = "amq_basic_09">
-  The server MUST NOT discard a persistent basic message in case of a
-  queue overflow. The server MAY use the Channel.Flow method to slow
-  or stop a basic message publisher when necessary.
-</doc>
-<doc name = "rule" test = "amq_basic_10">
-  The server MAY overflow non-persistent basic messages to persistent
-  storage and MAY discard or dead-letter non-persistent basic messages
-  on a priority basis if the queue size exceeds some configured limit.
-</doc>
-<doc name = "rule" test = "amq_basic_11">
-  The server MUST implement at least 2 priority levels for basic
-  messages, where priorities 0-4 and 5-9 are treated as two distinct
-  levels. The server MAY implement up to 10 priority levels.
-</doc>
-<doc name = "rule" test = "amq_basic_12">
-  The server MUST deliver messages of the same priority in order
-  irrespective of their individual persistence.
-</doc>
-<doc name = "rule" test = "amq_basic_13">
-  The server MUST support both automatic and explicit acknowledgements
-  on Basic content.
-</doc>
-
-<!--  These are the properties for a Basic content  -->
-
-<field name = "content type" type = "shortstr">
-    MIME content type
-</field>
-<field name = "content encoding" type = "shortstr">
-    MIME content encoding
-</field>
-<field name = "headers" type = "table">
-    Message header field table
-</field>
-<field name = "delivery mode" type = "octet">
-    Non-persistent (1) or persistent (2)
-</field>
-<field name = "priority" type = "octet">
-    The message priority, 0 to 9
-</field>
-<field name = "correlation id" type = "shortstr">
-    The application correlation identifier
-</field>
-<field name = "reply to" type = "shortstr">
-    The destination to reply to
-</field>
-<field name = "expiration" type = "shortstr">
-    Message expiration specification
-</field>
-<field name = "message id" type = "shortstr">
-    The application message identifier
-</field>
-<field name = "timestamp" type = "timestamp">
-    The message timestamp
-</field>
-<field name = "type" type = "shortstr">
-    The message type name
-</field>
-<field name = "user id" type = "shortstr">
-    The creating user id
-</field>
-<field name = "app id" type = "shortstr">
-    The creating application id
-</field>
-<field name = "cluster id" type = "shortstr">
-    Intra-cluster routing identifier
-</field>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "qos" synchronous = "1" index = "10">
-  specify quality of service
-  <doc>
-    This method requests a specific quality of service.  The QoS can
-    be specified for the current channel or for all channels on the
-    connection.  The particular properties and semantics of a qos method
-    always depend on the content class semantics.  Though the qos method
-    could in principle apply to both peers, it is currently meaningful
-    only for the server.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "qos-ok" />
-
-  <field name = "prefetch size" type = "long">
-    prefetch window in octets
-    <doc>
-      The client can request that messages be sent in advance so that
-      when the client finishes processing a message, the following
-      message is already held locally, rather than needing to be sent
-      down the channel.  Prefetching gives a performance improvement.
-      This field specifies the prefetch window size in octets.  The
-      server will send a message in advance if it is equal to or
-      smaller in size than the available prefetch size (and also falls
-      into other prefetch limits). May be set to zero, meaning "no
-      specific limit", although other prefetch limits may still apply.
-      The prefetch-size is ignored if the no-ack option is set.
-    </doc>
-    <doc name = "rule" test = "amq_basic_17">
-      The server MUST ignore this setting when the client is not
-      processing any messages - i.e. the prefetch size does not limit
-      the transfer of single messages to a client, only the sending in
-      advance of more messages while the client still has one or more
-      unacknowledged messages.
-   </doc>
-  </field>
-
-  <field name = "prefetch count" type = "short">
-    prefetch window in messages
-    <doc>
-      Specifies a prefetch window in terms of whole messages.  This
-      field may be used in combination with the prefetch-size field;
-      a message will only be sent in advance if both prefetch windows
-      (and those at the channel and connection level) allow it.
-      The prefetch-count is ignored if the no-ack option is set.
-    </doc>
-    <doc name = "rule" test = "amq_basic_18">
-      The server MAY send less data in advance than allowed by the
-      client's specified prefetch windows but it MUST NOT send more.
-    </doc>
-  </field>
-
-  <field name = "global" type = "bit">
-    apply to entire connection
-    <doc>
-      By default the QoS settings apply to the current channel only.  If
-      this field is set, they are applied to the entire connection.
-    </doc>
-  </field>
-</method>
-
-<method name = "qos-ok" synchronous = "1" index = "11">
-  confirm the requested qos
-  <doc>
-    This method tells the client that the requested QoS levels could
-    be handled by the server.  The requested QoS applies to all active
-    consumers until a new QoS is defined.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "consume" synchronous = "1" index = "20">
-  start a queue consumer
-  <doc>
-    This method asks the server to start a "consumer", which is a
-    transient request for messages from a specific queue. Consumers
-    last as long as the channel they were created on, or until the
-    client cancels them.
-  </doc>
-  <doc name = "rule" test = "amq_basic_01">
-    The server SHOULD support at least 16 consumers per queue, unless
-    the queue was declared as private, and ideally, impose no limit
-    except as defined by available resources.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "consume-ok" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Specifies the identifier for the consumer. The consumer tag is
-      local to a connection, so two clients can use the same consumer
-      tags. If this field is empty the server will generate a unique
-      tag.
-    </doc>
-    <doc name = "rule" test = "todo">
-      The tag MUST NOT refer to an existing consumer. If the client
-      attempts to create two consumers with the same non-empty tag
-      the server MUST raise a connection exception with reply code
-      530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no local" domain = "no local" />
-
-  <field name = "no ack" domain = "no ack" />
-
-  <field name = "exclusive" type = "bit">
-    request exclusive access
-    <doc>
-      Request exclusive consumer access, meaning only this consumer can
-      access the queue.
-    </doc>
-    <doc name = "rule" test = "amq_basic_02">
-      If the server cannot grant exclusive access to the queue when asked,
-      - because there are other consumers active - it MUST raise a channel
-      exception with return code 403 (access refused).
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "consume-ok" synchronous = "1" index = "21">
-  confirm a new consumer
-  <doc>
-    The server provides the client with a consumer tag, which is used
-    by the client for methods called on the consumer at a later stage.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Holds the consumer tag specified by the client or provided by
-      the server.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "cancel" synchronous = "1" index = "30">
-  end a queue consumer
-  <doc test = "amq_basic_04">
-    This method cancels a consumer. This does not affect already
-    delivered messages, but it does mean the server will not send any
-    more messages for that consumer.  The client may receive an
-    abitrary number of messages in between sending the cancel method
-    and receiving the cancel-ok reply.
-  </doc>
-  <doc name = "rule" test = "todo">
-    If the queue no longer exists when the client sends a cancel command,
-    or the consumer has been cancelled for other reasons, this command
-    has no effect.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "cancel-ok" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "cancel-ok" synchronous = "1" index = "31">
-  confirm a cancelled consumer
-  <doc>
-    This method confirms that the cancellation was completed.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "publish" content = "1" index = "40">
-  publish a message
-  <doc>
-    This method publishes a message to a specific exchange. The message
-    will be routed to queues as defined by the exchange configuration
-    and distributed to any active consumers when the transaction, if any,
-    is committed.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "write"
-      access rights to the access realm for the exchange.
-    </doc>
-  </field>
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange to publish to.  The exchange
-      name can be empty, meaning the default exchange.  If the exchange
-      name is specified, and that exchange does not exist, the server
-      will raise a channel exception.
-    </doc>
-    <doc name = "rule" test = "amq_basic_06">
-      The server MUST accept a blank exchange name to mean the default
-      exchange.
-    </doc>
-    <doc name = "rule" test = "amq_basic_14">
-      If the exchange was declared as an internal exchange, the server
-      MUST raise a channel exception with a reply code 403 (access
-      refused).
-    </doc>
-    <doc name = "rule" test = "amq_basic_15">
-      The exchange MAY refuse basic content in which case it MUST raise
-      a channel exception with reply code 540 (not implemented).
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key for the message.  The routing key is
-      used for routing messages depending on the exchange configuration.
-    </doc>
-  </field>
-
-  <field name = "mandatory" type = "bit">
-    indicate mandatory routing
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue.  If this flag is set, the server will return an
-      unroutable message with a Return method.  If this flag is zero, the
-      server silently drops the message.
-    </doc>
-    <doc name = "rule" test = "amq_basic_07">
-      The server SHOULD implement the mandatory flag.
-    </doc>
-  </field>
-
-  <field name = "immediate" type = "bit">
-    request immediate delivery
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue consumer immediately.  If this flag is set, the
-      server will return an undeliverable message with a Return method.
-      If this flag is zero, the server will queue the message, but with
-      no guarantee that it will ever be consumed.
-    </doc>
-    <doc name = "rule" test = "amq_basic_16">
-      The server SHOULD implement the immediate flag.
-    </doc>
-  </field>
-</method>
-
-<method name = "return" content = "1" index = "50">
-  return a failed message
-  <doc>
-    This method returns an undeliverable message that was published
-    with the "immediate" flag set, or an unroutable message published
-    with the "mandatory" flag set. The reply code and text provide
-    information about the reason that the message was undeliverable.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "reply code" domain = "reply code" />
-  <field name = "reply text" domain = "reply text" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "deliver" content = "1" index = "60">
-  notify the client of a consumer message
-  <doc>
-    This method delivers a message to the client, via a consumer.  In
-    the asynchronous message delivery model, the client starts a
-    consumer using the Consume method, then the server responds with
-    Deliver methods as and when messages arrive for that consumer.
-  </doc>
-  <doc name = "rule" test = "amq_basic_19">
-    The server SHOULD track the number of times a message has been
-    delivered to clients and when a message is redelivered a certain
-    number of times - e.g. 5 times - without being acknowledged, the
-    server SHOULD consider the message to be unprocessable (possibly
-    causing client applications to abort), and move the message to a
-    dead letter queue.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "redelivered" domain = "redelivered" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "get" synchronous = "1" index = "70">
-  direct access to a queue
-  <doc>
-    This method provides a direct access to the messages in a queue
-    using a synchronous dialogue that is designed for specific types of
-    application where synchronous functionality is more important than
-    performance.
-  </doc>
-  <response name = "get-ok" />
-  <response name = "get-empty" />
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read"
-      access rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no ack" domain = "no ack" />
-</method>
-
-<method name = "get-ok" synchronous = "1" content = "1" index = "71">
-  provide client with a message
-  <doc>
-    This method delivers a message to the client following a get
-    method.  A message delivered by 'get-ok' must be acknowledged
-    unless the no-ack option was set in the get method.
-  </doc>
-  <chassis name = "client" implement = "MAY" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "redelivered"  domain = "redelivered"  />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was originally
-      published to.  If empty, the message was published to the default
-      exchange.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-
-  <field name = "message count" type = "long" >
-    number of messages pending
-    <doc>
-      This field reports the number of messages pending on the queue,
-      excluding the message being delivered.  Note that this figure is
-      indicative, not reliable, and can change arbitrarily as messages
-      are added to the queue and removed by other clients.
-    </doc>
-  </field>
-</method>
-
-
-<method name = "get-empty" synchronous = "1" index = "72">
-  indicate no messages available
-  <doc>
-    This method tells the client that the queue has no messages
-    available for the client.
-  </doc>
-  <chassis name = "client" implement = "MAY" />
-
-  <field name = "cluster id" type = "shortstr">
-     Cluster id
-    <doc>
-      For use by cluster applications, should not be used by
-      client applications.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "ack" index = "80">
-  acknowledge one or more messages
-  <doc>
-    This method acknowledges one or more messages delivered via the
-    Deliver or Get-Ok methods.  The client can ask to confirm a
-    single message or a set of messages up to and including a specific
-    message.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "multiple" type = "bit">
-    acknowledge multiple messages
-    <doc>
-      If set to 1, the delivery tag is treated as "up to and including",
-      so that the client can acknowledge multiple messages with a single
-      method.  If set to zero, the delivery tag refers to a single
-      message.  If the multiple field is 1, and the delivery tag is zero,
-      tells the server to acknowledge all outstanding mesages.
-    </doc>
-    <doc name = "rule" test = "amq_basic_20">
-      The server MUST validate that a non-zero delivery-tag refers to an
-      delivered message, and raise a channel exception if this is not the
-      case.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "reject" index = "90">
-  reject an incoming message
-  <doc>
-    This method allows a client to reject a message.  It can be used to
-    interrupt and cancel large incoming messages, or return untreatable
-    messages to their original queue.
-  </doc>
-  <doc name = "rule" test = "amq_basic_21">
-    The server SHOULD be capable of accepting and process the Reject
-    method while sending message content with a Deliver or Get-Ok
-    method.  I.e. the server should read and process incoming methods
-    while sending output frames.  To cancel a partially-send content,
-    the server sends a content body frame of size 1 (i.e. with no data
-    except the frame-end octet).
-  </doc>
-  <doc name = "rule" test = "amq_basic_22">
-    The server SHOULD interpret this method as meaning that the client
-    is unable to process the message at this time.
-  </doc>
-  <doc name = "rule">
-    A client MUST NOT use this method as a means of selecting messages
-    to process.  A rejected message MAY be discarded or dead-lettered,
-    not necessarily passed to another client.
-  </doc>      
-  <chassis name = "server" implement = "MUST" />
-    
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "requeue" type = "bit">
-    requeue the message
-    <doc>
-      If this field is zero, the message will be discarded.  If this bit
-      is 1, the server will attempt to requeue the message.
-    </doc>
-    <doc name = "rule" test = "amq_basic_23">
-      The server MUST NOT deliver the message to the same client within
-      the context of the current channel.  The recommended strategy is
-      to attempt to deliver the message to an alternative consumer, and
-      if that is not possible, to move the message to a dead-letter
-      queue.  The server MAY use more sophisticated tracking to hold
-      the message on the queue and redeliver it to the same client at
-      a later stage.
-    </doc>
-  </field>
-</method>
-
-<method name = "recover" index = "100">
-  redeliver unacknowledged messages
-  <doc>
-    This method asks the broker to redeliver all unacknowledged messages on a
-    specified channel. Zero or more messages may be redelivered.  This method
-    is only allowed on non-transacted channels.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "requeue" type = "bit">
-    requeue the message
-    <doc>
-      If this field is zero, the message will be redelivered to the original
-      recipient.  If this bit is 1, the server will attempt to requeue the
-      message, potentially then delivering it to an alternative subscriber.
-    </doc>
-  </field>
-  <doc name="rule">
-    The server MUST set the redelivered flag on all messages that are resent.
-  </doc>
-  <doc name="rule">
-    The server MUST raise a channel exception if this is called on a 
-    transacted channel.
-  </doc>
-</method>
-
-</class>
-
-
-  <class name="file" handler="channel" index="70">
-    <!--
-======================================================
-==      FILE TRANSFER
-======================================================
--->
-  work with file content
-<doc>
-  The file class provides methods that support reliable file transfer.
-  File messages have a specific set of properties that are required for
-  interoperability with file transfer applications. File messages and
-  acknowledgements are subject to channel transactions.  Note that the
-  file class does not provide message browsing methods; these are not
-  compatible with the staging model.  Applications that need browsable
-  file transfer should use Basic content and the Basic class.
-</doc>
-
-<doc name = "grammar">
-    file                = C:QOS S:QOS-OK
-                        / C:CONSUME S:CONSUME-OK
-                        / C:CANCEL S:CANCEL-OK
-                        / C:OPEN S:OPEN-OK C:STAGE content
-                        / S:OPEN C:OPEN-OK S:STAGE content
-                        / C:PUBLISH
-                        / S:DELIVER
-                        / S:RETURN
-                        / C:ACK
-                        / C:REJECT
-</doc>
-
-<chassis name = "server" implement = "MAY" />
-<chassis name = "client" implement = "MAY" />
-
-<doc name = "rule">
-  The server MUST make a best-effort to hold file messages on a
-  reliable storage mechanism.
-</doc>
-<doc name = "rule">
-  The server MUST NOT discard a file message in case of a queue
-  overflow. The server MUST use the Channel.Flow method to slow or stop
-  a file message publisher when necessary.
-</doc>
-<doc name = "rule">
-  The server MUST implement at least 2 priority levels for file
-  messages, where priorities 0-4 and 5-9 are treated as two distinct
-  levels. The server MAY implement up to 10 priority levels.
-</doc>
-<doc name = "rule">
-  The server MUST support both automatic and explicit acknowledgements
-  on file content.
-</doc>
-
-<!--  These are the properties for a File content  -->
-
-<field name = "content type" type = "shortstr">
-    MIME content type
-</field>
-<field name = "content encoding" type = "shortstr">
-    MIME content encoding
-</field>
-<field name = "headers" type = "table">
-    Message header field table
-</field>
-<field name = "priority" type = "octet">
-    The message priority, 0 to 9
-</field>
-<field name = "reply to" type = "shortstr">
-    The destination to reply to
-</field>
-<field name = "message id" type = "shortstr">
-    The application message identifier
-</field>
-<field name = "filename" type = "shortstr">
-    The message filename
-</field>
-<field name = "timestamp" type = "timestamp">
-    The message timestamp
-</field>
-<field name = "cluster id" type = "shortstr">
-    Intra-cluster routing identifier
-</field>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "qos" synchronous = "1" index = "10">
-  specify quality of service
-  <doc>
-    This method requests a specific quality of service.  The QoS can
-    be specified for the current channel or for all channels on the
-    connection.  The particular properties and semantics of a qos method
-    always depend on the content class semantics.  Though the qos method
-    could in principle apply to both peers, it is currently meaningful
-    only for the server.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "qos-ok" />
-
-  <field name = "prefetch size" type = "long">
-    prefetch window in octets
-    <doc>
-      The client can request that messages be sent in advance so that
-      when the client finishes processing a message, the following
-      message is already held locally, rather than needing to be sent
-      down the channel.  Prefetching gives a performance improvement.
-      This field specifies the prefetch window size in octets. May be
-      set to zero, meaning "no specific limit".  Note that other
-      prefetch limits may still apply. The prefetch-size is ignored
-      if the no-ack option is set.
-    </doc>
-  </field>
-
-  <field name = "prefetch count" type = "short">
-    prefetch window in messages
-    <doc>
-      Specifies a prefetch window in terms of whole messages.  This
-      is compatible with some file API implementations.  This field
-      may be used in combination with the prefetch-size field; a
-      message will only be sent in advance if both prefetch windows
-      (and those at the channel and connection level) allow it.
-      The prefetch-count is ignored if the no-ack option is set.
-    </doc>
-    <doc name = "rule">
-      The server MAY send less data in advance than allowed by the
-      client's specified prefetch windows but it MUST NOT send more.
-    </doc>
-  </field>
-
-  <field name = "global" type = "bit">
-    apply to entire connection
-    <doc>
-      By default the QoS settings apply to the current channel only.  If
-      this field is set, they are applied to the entire connection.
-    </doc>
-  </field>
-</method>
-
-<method name = "qos-ok" synchronous = "1" index = "11">
-  confirm the requested qos
-  <doc>
-    This method tells the client that the requested QoS levels could
-    be handled by the server.  The requested QoS applies to all active
-    consumers until a new QoS is defined.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "consume" synchronous = "1" index = "20">
-  start a queue consumer
-  <doc>
-    This method asks the server to start a "consumer", which is a
-    transient request for messages from a specific queue. Consumers
-    last as long as the channel they were created on, or until the
-    client cancels them.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD support at least 16 consumers per queue, unless
-    the queue was declared as private, and ideally, impose no limit
-    except as defined by available resources.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "consume-ok" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Specifies the identifier for the consumer. The consumer tag is
-      local to a connection, so two clients can use the same consumer
-      tags. If this field is empty the server will generate a unique
-      tag.
-    </doc>
-    <doc name = "rule" test = "todo">
-      The tag MUST NOT refer to an existing consumer. If the client
-      attempts to create two consumers with the same non-empty tag
-      the server MUST raise a connection exception with reply code
-      530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no local" domain = "no local" />
-
-  <field name = "no ack" domain = "no ack" />
-
-  <field name = "exclusive" type = "bit">
-    request exclusive access
-    <doc>
-      Request exclusive consumer access, meaning only this consumer can
-      access the queue.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      If the server cannot grant exclusive access to the queue when asked,
-      - because there are other consumers active - it MUST raise a channel
-      exception with return code 405 (resource locked).
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "consume-ok" synchronous = "1" index = "21">
-  confirm a new consumer
-  <doc>
-    This method provides the client with a consumer tag which it MUST
-    use in methods that work with the consumer.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Holds the consumer tag specified by the client or provided by
-      the server.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "cancel" synchronous = "1" index = "30">
-  end a queue consumer
-  <doc>
-    This method cancels a consumer. This does not affect already
-    delivered messages, but it does mean the server will not send any
-    more messages for that consumer.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "cancel-ok" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "cancel-ok" synchronous = "1" index = "31">
-  confirm a cancelled consumer
-  <doc>
-    This method confirms that the cancellation was completed.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "open" synchronous = "1" index = "40">
-  request to start staging
-  <doc>
-    This method requests permission to start staging a message.  Staging
-    means sending the message into a temporary area at the recipient end
-    and then delivering the message by referring to this temporary area.
-    Staging is how the protocol handles partial file transfers - if a
-    message is partially staged and the connection breaks, the next time
-    the sender starts to stage it, it can restart from where it left off.
-  </doc>
-  <response name = "open-ok" />
-  <chassis name = "server" implement = "MUST" />
-  <chassis name = "client" implement = "MUST" />
-  
-  <field name = "identifier" type = "shortstr">
-    staging identifier
-    <doc>
-      This is the staging identifier. This is an arbitrary string chosen
-      by the sender.  For staging to work correctly the sender must use
-      the same staging identifier when staging the same message a second
-      time after recovery from a failure.  A good choice for the staging
-      identifier would be the SHA1 hash of the message properties data
-      (including the original filename, revised time, etc.).
-    </doc>
-  </field>
-
-  <field name = "content size" type = "longlong">
-    message content size
-    <doc>
-      The size of the content in octets.  The recipient may use this
-      information to allocate or check available space in advance, to
-      avoid "disk full" errors during staging of very large messages.
-    </doc>
-    <doc name = "rule">
-      The sender MUST accurately fill the content-size field.
-      Zero-length content is permitted.
-    </doc>
-  </field>
-</method>
-
-<method name = "open-ok" synchronous = "1" index = "41">
-  confirm staging ready
-  <doc>
-    This method confirms that the recipient is ready to accept staged
-    data.  If the message was already partially-staged at a previous
-    time the recipient will report the number of octets already staged.
-  </doc>
-  <response name = "stage" />
-  <chassis name = "server" implement = "MUST" />
-  <chassis name = "client" implement = "MUST" />
-  
-  <field name = "staged size" type = "longlong">
-    already staged amount
-    <doc>
-      The amount of previously-staged content in octets.  For a new
-      message this will be zero.
-    </doc>
-    <doc name = "rule">
-      The sender MUST start sending data from this octet offset in the
-      message, counting from zero.
-    </doc>
-    <doc name = "rule">
-      The recipient MAY decide how long to hold partially-staged content
-      and MAY implement staging by always discarding partially-staged
-      content.  However if it uses the file content type it MUST support
-      the staging methods.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "stage" content = "1" index = "50">
-  stage message content
-  <doc>
-    This method stages the message, sending the message content to the
-    recipient from the octet offset specified in the Open-Ok method.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "publish" index = "60">
-  publish a message
-  <doc>
-    This method publishes a staged file message to a specific exchange.
-    The file message will be routed to queues as defined by the exchange
-    configuration and distributed to any active consumers when the
-    transaction, if any, is committed.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "write"
-      access rights to the access realm for the exchange.
-    </doc>
-  </field>
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange to publish to.  The exchange
-      name can be empty, meaning the default exchange.  If the exchange
-      name is specified, and that exchange does not exist, the server
-      will raise a channel exception.
-    </doc>
-    <doc name = "rule">
-      The server MUST accept a blank exchange name to mean the default
-      exchange.
-    </doc>
-    <doc name = "rule">
-      If the exchange was declared as an internal exchange, the server
-      MUST respond with a reply code 403 (access refused) and raise a
-      channel exception.
-    </doc>
-    <doc name = "rule">
-      The exchange MAY refuse file content in which case it MUST respond
-      with a reply code 540 (not implemented) and raise a channel
-      exception.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key for the message.  The routing key is
-      used for routing messages depending on the exchange configuration.
-    </doc>
-  </field>
-
-  <field name = "mandatory" type = "bit">
-    indicate mandatory routing
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue.  If this flag is set, the server will return an
-      unroutable message with a Return method.  If this flag is zero, the
-      server silently drops the message.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      The server SHOULD implement the mandatory flag.
-    </doc>
-  </field>
-
-  <field name = "immediate" type = "bit">
-    request immediate delivery
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue consumer immediately.  If this flag is set, the
-      server will return an undeliverable message with a Return method.
-      If this flag is zero, the server will queue the message, but with
-      no guarantee that it will ever be consumed.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      The server SHOULD implement the immediate flag.
-    </doc>
-  </field>
-
-  <field name = "identifier" type = "shortstr">
-    staging identifier
-    <doc>
-      This is the staging identifier of the message to publish.  The
-      message must have been staged.  Note that a client can send the
-      Publish method asynchronously without waiting for staging to
-      finish.
-    </doc>
-  </field>
-</method>
-
-<method name = "return" content = "1" index = "70">
-  return a failed message
-  <doc>
-    This method returns an undeliverable message that was published
-    with the "immediate" flag set, or an unroutable message published
-    with the "mandatory" flag set. The reply code and text provide
-    information about the reason that the message was undeliverable.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "reply code" domain = "reply code" />
-  <field name = "reply text" domain = "reply text" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "deliver" index = "80">
-  notify the client of a consumer message
-  <doc>
-    This method delivers a staged file message to the client, via a
-    consumer. In the asynchronous message delivery model, the client
-    starts a consumer using the Consume method, then the server
-    responds with Deliver methods as and when messages arrive for
-    that consumer.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD track the number of times a message has been
-    delivered to clients and when a message is redelivered a certain
-    number of times - e.g. 5 times - without being acknowledged, the
-    server SHOULD consider the message to be unprocessable (possibly
-    causing client applications to abort), and move the message to a
-    dead letter queue.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "redelivered" domain = "redelivered" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was originally
-      published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>
-  </field>
-
-  <field name = "identifier" type = "shortstr">
-    staging identifier
-    <doc>
-      This is the staging identifier of the message to deliver.  The
-      message must have been staged.  Note that a server can send the
-      Deliver method asynchronously without waiting for staging to
-      finish.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "ack" index = "90">
-  acknowledge one or more messages
-  <doc>
-    This method acknowledges one or more messages delivered via the
-    Deliver method.  The client can ask to confirm a single message or
-    a set of messages up to and including a specific message.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <field name = "delivery tag" domain = "delivery tag" />
-      
-  <field name = "multiple" type = "bit">
-    acknowledge multiple messages
-    <doc>
-      If set to 1, the delivery tag is treated as "up to and including",
-      so that the client can acknowledge multiple messages with a single
-      method.  If set to zero, the delivery tag refers to a single
-      message.  If the multiple field is 1, and the delivery tag is zero,
-      tells the server to acknowledge all outstanding mesages.
-    </doc>
-    <doc name = "rule">
-      The server MUST validate that a non-zero delivery-tag refers to an
-      delivered message, and raise a channel exception if this is not the
-      case.
-    </doc>
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "reject" index = "100">
-  reject an incoming message
-  <doc>
-    This method allows a client to reject a message.  It can be used to
-    return untreatable messages to their original queue.  Note that file
-    content is staged before delivery, so the client will not use this
-    method to interrupt delivery of a large message.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD interpret this method as meaning that the client
-    is unable to process the message at this time.
-  </doc>
-  <doc name = "rule">
-    A client MUST NOT use this method as a means of selecting messages
-    to process.  A rejected message MAY be discarded or dead-lettered,
-    not necessarily passed to another client.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-    
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "requeue" type = "bit">
-    requeue the message
-    <doc>
-      If this field is zero, the message will be discarded.  If this bit
-      is 1, the server will attempt to requeue the message.
-    </doc>
-    <doc name = "rule">
-      The server MUST NOT deliver the message to the same client within
-      the context of the current channel.  The recommended strategy is
-      to attempt to deliver the message to an alternative consumer, and
-      if that is not possible, to move the message to a dead-letter
-      queue.  The server MAY use more sophisticated tracking to hold
-      the message on the queue and redeliver it to the same client at
-      a later stage.
-    </doc>
-  </field>
-</method>
-
-</class>
-
-  <class name="stream" handler="channel" index="80">
-    <!--
-======================================================
-==       STREAMING
-======================================================
--->
-  work with streaming content
-
-<doc>
-  The stream class provides methods that support multimedia streaming.
-  The stream class uses the following semantics: one message is one
-  packet of data; delivery is unacknowleged and unreliable; the consumer
-  can specify quality of service parameters that the server can try to
-  adhere to; lower-priority messages may be discarded in favour of high
-  priority messages.
-</doc>
-
-<doc name = "grammar">
-    stream              = C:QOS S:QOS-OK
-                        / C:CONSUME S:CONSUME-OK
-                        / C:CANCEL S:CANCEL-OK
-                        / C:PUBLISH content
-                        / S:RETURN
-                        / S:DELIVER content
-</doc>
-
-<chassis name = "server" implement = "MAY" />
-<chassis name = "client" implement = "MAY" />
-
-<doc name = "rule">
-  The server SHOULD discard stream messages on a priority basis if
-  the queue size exceeds some configured limit.
-</doc>
-<doc name = "rule">
-  The server MUST implement at least 2 priority levels for stream
-  messages, where priorities 0-4 and 5-9 are treated as two distinct
-  levels. The server MAY implement up to 10 priority levels.
-</doc>
-<doc name = "rule">
-  The server MUST implement automatic acknowledgements on stream
-  content.  That is, as soon as a message is delivered to a client
-  via a Deliver method, the server must remove it from the queue.
-</doc>
-
-
-<!--  These are the properties for a Stream content  -->
-
-<field name = "content type" type = "shortstr">
-    MIME content type
-</field>
-<field name = "content encoding" type = "shortstr">
-    MIME content encoding
-</field>
-<field name = "headers" type = "table">
-    Message header field table
-</field>
-<field name = "priority" type = "octet">
-    The message priority, 0 to 9
-</field>
-<field name = "timestamp" type = "timestamp">
-    The message timestamp
-</field>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "qos" synchronous = "1" index = "10">
-  specify quality of service
-  <doc>
-    This method requests a specific quality of service.  The QoS can
-    be specified for the current channel or for all channels on the
-    connection.  The particular properties and semantics of a qos method
-    always depend on the content class semantics.  Though the qos method
-    could in principle apply to both peers, it is currently meaningful
-    only for the server.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "qos-ok" />
-
-  <field name = "prefetch size" type = "long">
-    prefetch window in octets
-    <doc>
-      The client can request that messages be sent in advance so that
-      when the client finishes processing a message, the following
-      message is already held locally, rather than needing to be sent
-      down the channel.  Prefetching gives a performance improvement.
-      This field specifies the prefetch window size in octets. May be
-      set to zero, meaning "no specific limit".  Note that other
-      prefetch limits may still apply.
-    </doc>
-  </field>
-
-  <field name = "prefetch count" type = "short">
-    prefetch window in messages
-    <doc>
-      Specifies a prefetch window in terms of whole messages.  This
-      field may be used in combination with the prefetch-size field;
-      a message will only be sent in advance if both prefetch windows
-      (and those at the channel and connection level) allow it.
-    </doc>
-  </field>
-
-  <field name = "consume rate" type = "long">
-    transfer rate in octets/second
-    <doc>
-      Specifies a desired transfer rate in octets per second. This is
-      usually determined by the application that uses the streaming
-      data.  A value of zero means "no limit", i.e. as rapidly as
-      possible.
-    </doc>
-    <doc name = "rule">
-      The server MAY ignore the prefetch values and consume rates,
-      depending on the type of stream and the ability of the server
-      to queue and/or reply it.  The server MAY drop low-priority
-      messages in favour of high-priority messages.
-    </doc>
-  </field>
-
-  <field name = "global" type = "bit">
-    apply to entire connection
-    <doc>
-      By default the QoS settings apply to the current channel only.  If
-      this field is set, they are applied to the entire connection.
-    </doc>
-  </field>
-</method>
-
-<method name = "qos-ok" synchronous = "1" index = "11">
-  confirm the requested qos
-  <doc>
-    This method tells the client that the requested QoS levels could
-    be handled by the server.  The requested QoS applies to all active
-    consumers until a new QoS is defined.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "consume" synchronous = "1" index = "20">
-  start a queue consumer
-  <doc>
-    This method asks the server to start a "consumer", which is a
-    transient request for messages from a specific queue. Consumers
-    last as long as the channel they were created on, or until the
-    client cancels them.
-  </doc>
-  <doc name = "rule">
-    The server SHOULD support at least 16 consumers per queue, unless
-    the queue was declared as private, and ideally, impose no limit
-    except as defined by available resources.
-  </doc>
-  <doc name = "rule">
-    Streaming applications SHOULD use different channels to select
-    different streaming resolutions. AMQP makes no provision for
-    filtering and/or transforming streams except on the basis of
-    priority-based selective delivery of individual messages.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "consume-ok" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "read" access
-      rights to the realm for the queue.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue to consume from.  If the queue name
-      is null, refers to the current queue for the channel, which is the
-      last declared queue.
-    </doc>
-    <doc name = "rule">
-      If the client did not previously declare a queue, and the queue name
-      in this method is empty, the server MUST raise a connection exception
-      with reply code 530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Specifies the identifier for the consumer. The consumer tag is
-      local to a connection, so two clients can use the same consumer
-      tags. If this field is empty the server will generate a unique
-      tag.
-    </doc>
-    <doc name = "rule" test = "todo">
-      The tag MUST NOT refer to an existing consumer. If the client
-      attempts to create two consumers with the same non-empty tag
-      the server MUST raise a connection exception with reply code
-      530 (not allowed).
-    </doc>
-  </field>
-
-  <field name = "no local" domain = "no local" />
-
-  <field name = "exclusive" type = "bit">
-    request exclusive access
-    <doc>
-      Request exclusive consumer access, meaning only this consumer can
-      access the queue.
-    </doc>
-    <doc name = "rule" test = "amq_file_00">
-      If the server cannot grant exclusive access to the queue when asked,
-      - because there are other consumers active - it MUST raise a channel
-      exception with return code 405 (resource locked).
-    </doc>
-  </field>
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-
-<method name = "consume-ok" synchronous = "1" index = "21">
-  confirm a new consumer
-  <doc>
-    This method provides the client with a consumer tag which it may
-    use in methods that work with the consumer.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag">
-    <doc>
-      Holds the consumer tag specified by the client or provided by
-      the server.
-    </doc>
-  </field>
-</method>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "cancel" synchronous = "1" index = "30">
-  end a queue consumer
-  <doc>
-    This method cancels a consumer.  Since message delivery is
-    asynchronous the client may continue to receive messages for
-    a short while after canceling a consumer.  It may process or
-    discard these as appropriate.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-  <response name = "cancel-ok" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "nowait" type = "bit">
-    do not send a reply method
-    <doc>
-    If set, the server will not respond to the method. The client should
-    not wait for a reply method.  If the server could not complete the
-    method it will raise a channel or connection exception.
-    </doc>
-  </field>
-</method>
-
-<method name = "cancel-ok" synchronous = "1" index = "31">
-  confirm a cancelled consumer
-  <doc>
-    This method confirms that the cancellation was completed.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "publish" content = "1" index = "40">
-  publish a message
-  <doc>
-    This method publishes a message to a specific exchange. The message
-    will be routed to queues as defined by the exchange configuration
-    and distributed to any active consumers as appropriate.
-  </doc>
-  <chassis name = "server" implement = "MUST" />
-
-  <field name = "ticket" domain = "access ticket">
-    <doc name = "rule">
-      The client MUST provide a valid access ticket giving "write"
-      access rights to the access realm for the exchange.
-    </doc>
-  </field>
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange to publish to.  The exchange
-      name can be empty, meaning the default exchange.  If the exchange
-      name is specified, and that exchange does not exist, the server
-      will raise a channel exception.
-    </doc>
-    <doc name = "rule">
-      The server MUST accept a blank exchange name to mean the default
-      exchange.
-    </doc>
-    <doc name = "rule">
-      If the exchange was declared as an internal exchange, the server
-      MUST respond with a reply code 403 (access refused) and raise a
-      channel exception.
-    </doc>
-    <doc name = "rule">
-      The exchange MAY refuse stream content in which case it MUST
-      respond with a reply code 540 (not implemented) and raise a
-      channel exception.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key for the message.  The routing key is
-      used for routing messages depending on the exchange configuration.
-    </doc>
-  </field>
-
-  <field name = "mandatory" type = "bit">
-    indicate mandatory routing
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue.  If this flag is set, the server will return an
-      unroutable message with a Return method.  If this flag is zero, the
-      server silently drops the message.
-    </doc>
-    <doc name = "rule" test = "amq_stream_00">
-      The server SHOULD implement the mandatory flag.
-    </doc>
-  </field>
-
-  <field name = "immediate" type = "bit">
-    request immediate delivery
-    <doc>
-      This flag tells the server how to react if the message cannot be
-      routed to a queue consumer immediately.  If this flag is set, the
-      server will return an undeliverable message with a Return method.
-      If this flag is zero, the server will queue the message, but with
-      no guarantee that it will ever be consumed.
-    </doc>
-    <doc name = "rule" test = "amq_stream_00">
-      The server SHOULD implement the immediate flag.
-    </doc>
-  </field>
-</method>
-
-<method name = "return" content = "1" index = "50">
-  return a failed message
-  <doc>
-    This method returns an undeliverable message that was published
-    with the "immediate" flag set, or an unroutable message published
-    with the "mandatory" flag set. The reply code and text provide
-    information about the reason that the message was undeliverable.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "reply code" domain = "reply code" />
-  <field name = "reply text" domain = "reply text" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was
-      originally published to.
-    </doc>
-  </field>
-
-  <field name = "routing key" type = "shortstr">
-     Message routing key
-    <doc>
-      Specifies the routing key name specified when the message was
-      published.
-    </doc>     
-  </field>
-</method>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<method name = "deliver" content = "1" index = "60">
-  notify the client of a consumer message
-  <doc>
-    This method delivers a message to the client, via a consumer.  In
-    the asynchronous message delivery model, the client starts a
-    consumer using the Consume method, then the server responds with
-    Deliver methods as and when messages arrive for that consumer.
-  </doc>
-  <chassis name = "client" implement = "MUST" />
-
-  <field name = "consumer tag" domain = "consumer tag" />
-
-  <field name = "delivery tag" domain = "delivery tag" />
-
-  <field name = "exchange" domain = "exchange name">
-    <doc>
-      Specifies the name of the exchange that the message was originally
-      published to.
-    </doc>
-  </field>
-
-  <field name = "queue" domain = "queue name">
-    <doc>
-      Specifies the name of the queue that the message came from. Note
-      that a single channel can start many consumers on different
-      queues.
-    </doc>
-    <assert check = "notnull" />
-  </field>
-</method>
-  </class>
-
-  <class name="tx" handler="channel" index="90">
-    <!--
-======================================================
-==       TRANSACTIONS
-======================================================
--->
-  work with standard transactions
-
-<doc>
-  Standard transactions provide so-called "1.5 phase commit".  We can
-  ensure that work is never lost, but there is a chance of confirmations
-  being lost, so that messages may be resent.  Applications that use
-  standard transactions must be able to detect and ignore duplicate
-  messages.
-</doc>
-    <rule implement="SHOULD">
-  An client using standard transactions SHOULD be able to track all
-  messages received within a reasonable period, and thus detect and
-  reject duplicates of the same message. It SHOULD NOT pass these to
-  the application layer.
-</rule>
-    <doc name="grammar">
-    tx                  = C:SELECT S:SELECT-OK
-                        / C:COMMIT S:COMMIT-OK
-                        / C:ROLLBACK S:ROLLBACK-OK
-</doc>
-    <chassis name="server" implement="SHOULD"/>
-    <chassis name="client" implement="MAY"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="select" synchronous="1" index="10">
-select standard transaction mode
-  <doc>
-    This method sets the channel to use standard transactions.  The
-    client must use this method at least once on a channel before
-    using the Commit or Rollback methods.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="select-ok"/>
-    </method>
-    <method name="select-ok" synchronous="1" index="11">
-confirm transaction mode
-  <doc>
-    This method confirms to the client that the channel was successfully
-    set to use standard transactions.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="commit" synchronous="1" index="20">
-commit the current transaction
-  <doc>
-    This method commits all messages published and acknowledged in
-    the current transaction.  A new transaction starts immediately
-    after a commit.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="commit-ok"/>
-    </method>
-    <method name="commit-ok" synchronous="1" index="21">
-confirm a successful commit
-  <doc>
-    This method confirms to the client that the commit succeeded.
-    Note that if a commit fails, the server raises a channel exception.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="rollback" synchronous="1" index="30">
-abandon the current transaction
-  <doc>
-    This method abandons all messages published and acknowledged in
-    the current transaction.  A new transaction starts immediately
-    after a rollback.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="rollback-ok"/>
-    </method>
-    <method name="rollback-ok" synchronous="1" index="31">
-confirm a successful rollback
-  <doc>
-    This method confirms to the client that the rollback succeeded.
-    Note that if an rollback fails, the server raises a channel exception.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="dtx" handler="channel" index="100">
-    <!--
-======================================================
-==       DISTRIBUTED TRANSACTIONS
-======================================================
--->
-  work with distributed transactions
-
-<doc>
-  Distributed transactions provide so-called "2-phase commit".    The
-  AMQP distributed transaction model supports the X-Open XA
-  architecture and other distributed transaction implementations.
-  The Dtx class assumes that the server has a private communications
-  channel (not AMQP) to a distributed transaction coordinator.
-</doc>
-    <doc name="grammar">
-    dtx                 = C:SELECT S:SELECT-OK
-                          C:START S:START-OK
-</doc>
-    <chassis name="server" implement="MAY"/>
-    <chassis name="client" implement="MAY"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="select" synchronous="1" index="10">
-select standard transaction mode
-  <doc>
-    This method sets the channel to use distributed transactions.  The
-    client must use this method at least once on a channel before
-    using the Start method.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <response name="select-ok"/>
-    </method>
-    <method name="select-ok" synchronous="1" index="11">
-confirm transaction mode
-  <doc>
-    This method confirms to the client that the channel was successfully
-    set to use distributed transactions.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="start" synchronous="1" index="20">
-  start a new distributed transaction
-  <doc>
-    This method starts a new distributed transaction.  This must be
-    the first method on a new channel that uses the distributed
-    transaction mode, before any methods that publish or consume
-    messages.
-  </doc>
-      <chassis name="server" implement="MAY"/>
-      <response name="start-ok"/>
-      <field name="dtx identifier" type="shortstr">
-    transaction identifier
-    <doc>
-      The distributed transaction key. This identifies the transaction
-      so that the AMQP server can coordinate with the distributed
-      transaction coordinator.
-    </doc>
-        <assert check="notnull"/>
-      </field>
-    </method>
-    <method name="start-ok" synchronous="1" index="21">
-  confirm the start of a new distributed transaction
-  <doc>
-    This method confirms to the client that the transaction started.
-    Note that if a start fails, the server raises a channel exception.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-    </method>
-  </class>
-  <class name="tunnel" handler="tunnel" index="110">
-    <!--
-======================================================
-==       TUNNEL
-======================================================
--->
-  methods for protocol tunneling.
-
-<doc>
-  The tunnel methods are used to send blocks of binary data - which
-  can be serialised AMQP methods or other protocol frames - between
-  AMQP peers.
-</doc>
-    <doc name="grammar">
-    tunnel              = C:REQUEST
-                        / S:REQUEST
-</doc>
-    <chassis name="server" implement="MAY"/>
-    <chassis name="client" implement="MAY"/>
-    <field name="headers" type="table">
-    Message header field table
-</field>
-    <field name="proxy name" type="shortstr">
-    The identity of the tunnelling proxy
-</field>
-    <field name="data name" type="shortstr">
-    The name or type of the message being tunnelled
-</field>
-    <field name="durable" type="octet">
-    The message durability indicator
-</field>
-    <field name="broadcast" type="octet">
-    The message broadcast mode
-</field>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="request" content="1" index="10">
-  sends a tunnelled method
-  <doc>
-    This method tunnels a block of binary data, which can be an
-    encoded AMQP method or other data.  The binary data is sent
-    as the content for the Tunnel.Request method.
-  </doc>
-      <chassis name="server" implement="MUST"/>
-      <field name="meta data" type="table">
-    meta data for the tunnelled block
-    <doc>
-    This field table holds arbitrary meta-data that the sender needs
-    to pass to the recipient.
-    </doc>
-      </field>
-    </method>
-  </class>
-  <class name="test" handler="channel" index="120">
-    <!--
-======================================================
-==       TEST - CHECK FUNCTIONAL CAPABILITIES OF AN IMPLEMENTATION
-======================================================
--->
-  test functional primitives of the implementation
-
-<doc>
-  The test class provides methods for a peer to test the basic
-  operational correctness of another peer. The test methods are
-  intended to ensure that all peers respect at least the basic
-  elements of the protocol, such as frame and content organisation
-  and field types. We assume that a specially-designed peer, a
-  "monitor client" would perform such tests.
-</doc>
-    <doc name="grammar">
-    test                = C:INTEGER S:INTEGER-OK
-                        / S:INTEGER C:INTEGER-OK
-                        / C:STRING S:STRING-OK
-                        / S:STRING C:STRING-OK
-                        / C:TABLE S:TABLE-OK
-                        / S:TABLE C:TABLE-OK
-                        / C:CONTENT S:CONTENT-OK
-                        / S:CONTENT C:CONTENT-OK
-</doc>
-    <chassis name="server" implement="MUST"/>
-    <chassis name="client" implement="SHOULD"/>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="integer" synchronous="1" index="10">
-  test integer handling
-  <doc>
-    This method tests the peer's capability to correctly marshal integer
-    data.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="integer-ok"/>
-      <field name="integer 1" type="octet">
-    octet test value
-    <doc>
-      An octet integer test value.
-    </doc>
-      </field>
-      <field name="integer 2" type="short">
-    short test value
-    <doc>
-      A short integer test value.
-    </doc>
-      </field>
-      <field name="integer 3" type="long">
-    long test value
-    <doc>
-      A long integer test value.
-    </doc>
-      </field>
-      <field name="integer 4" type="longlong">
-    long-long test value
-    <doc>
-      A long long integer test value.
-    </doc>
-      </field>
-      <field name="operation" type="octet">
-    operation to test
-    <doc>
-      The client must execute this operation on the provided integer
-      test fields and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return sum of test values</value>
-          <value name="min">return lowest of test values</value>
-          <value name="max">return highest of test values</value>
-        </assert>
-      </field>
-    </method>
-    <method name="integer-ok" synchronous="1" index="11">
-  report integer test result
-  <doc>
-    This method reports the result of an Integer method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="result" type="longlong">
-    result value
-    <doc>
-      The result of the tested operation.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="string" synchronous="1" index="20">
-  test string handling
-  <doc>
-    This method tests the peer's capability to correctly marshal string
-    data.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="string-ok"/>
-      <field name="string 1" type="shortstr">
-    short string test value
-    <doc>
-      An short string test value.
-    </doc>
-      </field>
-      <field name="string 2" type="longstr">
-    long string test value
-    <doc>
-      A long string test value.
-    </doc>
-      </field>
-      <field name="operation" type="octet">
-    operation to test
-    <doc>
-      The client must execute this operation on the provided string
-      test fields and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return concatentation of test strings</value>
-          <value name="min">return shortest of test strings</value>
-          <value name="max">return longest of test strings</value>
-        </assert>
-      </field>
-    </method>
-    <method name="string-ok" synchronous="1" index="21">
-  report string test result
-  <doc>
-    This method reports the result of a String method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="result" type="longstr">
-    result value
-    <doc>
-      The result of the tested operation.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="table" synchronous="1" index="30">
-  test field table handling
-  <doc>
-    This method tests the peer's capability to correctly marshal field
-    table data.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="table-ok"/>
-      <field name="table" type="table">
-    field table of test values
-    <doc>
-      A field table of test values.
-    </doc>
-      </field>
-      <field name="integer op" type="octet">
-    operation to test on integers
-    <doc>
-      The client must execute this operation on the provided field
-      table integer values and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return sum of numeric field values</value>
-          <value name="min">return min of numeric field values</value>
-          <value name="max">return max of numeric field values</value>
-        </assert>
-      </field>
-      <field name="string op" type="octet">
-    operation to test on strings
-    <doc>
-      The client must execute this operation on the provided field
-      table string values and return the result.
-    </doc>
-        <assert check="enum">
-          <value name="add">return concatenation of string field values</value>
-          <value name="min">return shortest of string field values</value>
-          <value name="max">return longest of string field values</value>
-        </assert>
-      </field>
-    </method>
-    <method name="table-ok" synchronous="1" index="31">
-  report table test result
-  <doc>
-    This method reports the result of a Table method.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="integer result" type="longlong">
-    integer result value
-    <doc>
-      The result of the tested integer operation.
-    </doc>
-      </field>
-      <field name="string result" type="longstr">
-    string result value
-    <doc>
-      The result of the tested string operation.
-    </doc>
-      </field>
-    </method>
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <method name="content" synchronous="1" content="1" index="40">
-  test content handling
-  <doc>
-    This method tests the peer's capability to correctly marshal content.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <response name="content-ok"/>
-    </method>
-    <method name="content-ok" synchronous="1" content="1" index="41">
-  report content test result
-  <doc>
-    This method reports the result of a Content method.  It contains the
-    content checksum and echoes the original content as provided.
-  </doc>
-      <chassis name="client" implement="MUST"/>
-      <chassis name="server" implement="MUST"/>
-      <field name="content checksum" type="long">
-    content hash
-    <doc>
-      The 32-bit checksum of the content, calculated by adding the
-      content into a 32-bit accumulator.
-    </doc>
-      </field>
-    </method>
-  </class>
-</amqp>
diff --git a/cpp/gentools/xml-src/amqp-0.9.test.xml b/cpp/gentools/xml-src/amqp-0.9.test.xml
deleted file mode 100644
index e12e9c787a..0000000000
--- a/cpp/gentools/xml-src/amqp-0.9.test.xml
+++ /dev/null
@@ -1,4282 +0,0 @@
-<?xml version = "1.0"?>
-
-<!--
-    EDITORS: (PH)   Pieter Hintjens <ph@imatix.com>
-    (KvdR) Kim van der Riet <kim.vdriet@redhat.com>
-
-    These editors have been assigned by the AMQP working group.
-    Please do not edit/commit this file without consulting with
-    one of the above editors.
-    ========================================================
-
-    TODOs
-        - see TODO comments in the text
--->
-
-<!--
-    Copyright Notice
-    ================
-    (c) Copyright JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc.,
-    iMatix Corporation, IONA\ufffd Technologies, Red Hat, Inc.,
-    TWIST Process Innovations, and 29West Inc. 2006. All rights reserved.
-    
-    License
-    =======
-    JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix 
-    Corporation, IONA\ufffd Technologies, Red Hat, Inc., TWIST Process Innovations, and 
-    29West Inc. (collectively, the "Authors") each hereby grants to you a worldwide,
-    perpetual, royalty-free, nontransferable, nonexclusive license to
-    (i) copy, display, and implement the Advanced Messaging Queue Protocol
-    ("AMQP") Specification and (ii) the Licensed Claims that are held by
-    the Authors, all for the purpose of implementing the Advanced Messaging
-    Queue Protocol Specification. Your license and any rights under this
-    Agreement will terminate immediately without notice from
-    any Author if you bring any claim, suit, demand, or action related to
-    the Advanced Messaging Queue Protocol Specification against any Author.
-    Upon termination, you shall destroy all copies of the Advanced Messaging
-    Queue Protocol Specification in your possession or control.
-
-    As used hereunder, "Licensed Claims" means those claims of a patent or
-    patent application, throughout the world, excluding design patents and
-    design registrations, owned or controlled, or that can be sublicensed
-    without fee and in compliance with the requirements of this
-    Agreement, by an Author or its affiliates now or at any
-    future time and which would necessarily be infringed by implementation
-    of the Advanced Messaging Queue Protocol Specification. A claim is
-    necessarily infringed hereunder only when it is not possible to avoid
-    infringing it because there is no plausible non-infringing alternative
-    for implementing the required portions of the Advanced Messaging Queue
-    Protocol Specification. Notwithstanding the foregoing, Licensed Claims
-    shall not include any claims other than as set forth above even if
-    contained in the same patent as Licensed Claims; or that read solely
-    on any implementations of any portion of the Advanced Messaging Queue
-    Protocol Specification that are not required by the Advanced Messaging
-    Queue Protocol Specification, or that, if licensed, would require a
-    payment of royalties by the licensor to unaffiliated third parties.
-    Moreover, Licensed Claims shall not include (i) any enabling technologies
-    that may be necessary to make or use any Licensed Product but are not
-    themselves expressly set forth in the Advanced Messaging Queue Protocol
-    Specification (e.g., semiconductor manufacturing technology, compiler
-    technology, object oriented technology, networking technology, operating
-    system technology, and the like); or (ii) the implementation of other
-    published standards developed elsewhere and merely referred to in the
-    body of the Advanced Messaging Queue Protocol Specification, or
-    (iii) any Licensed Product and any combinations thereof the purpose or
-    function of which is not required for compliance with the Advanced
-    Messaging Queue Protocol Specification. For purposes of this definition,
-    the Advanced Messaging Queue Protocol Specification shall be deemed to
-    include both architectural and interconnection requirements essential
-    for interoperability and may also include supporting source code artifacts
-    where such architectural, interconnection requirements and source code
-    artifacts are expressly identified as being required or documentation to
-    achieve compliance with the Advanced Messaging Queue Protocol Specification.
-    
-    As used hereunder, "Licensed Products" means only those specific portions
-    of products (hardware, software or combinations thereof) that implement
-    and are compliant with all relevant portions of the Advanced Messaging
-    Queue Protocol Specification.
-    
-    The following disclaimers, which you hereby also acknowledge as to any
-    use you may make of the Advanced Messaging Queue Protocol Specification:
-    
-    THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS,"
-    AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-    IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE
-    CONTENTS OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE
-    SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF THE ADVANCED
-    MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD PARTY 
-    PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-    
-    THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-    INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-    USE, IMPLEMENTATION OR DISTRIBUTION OF THE ADVANCED MESSAGING QUEUE
-    PROTOCOL SPECIFICATION.
-    
-    The name and trademarks of the Authors may NOT be used in any manner,
-    including advertising or publicity pertaining to the Advanced Messaging
-    Queue Protocol Specification or its contents without specific, written
-    prior permission. Title to copyright in the Advanced Messaging Queue
-    Protocol Specification will at all times remain with the Authors.
-    
-    No other rights are granted by implication, estoppel or otherwise.
-    
-    Upon termination of your license or rights under this Agreement, you
-    shall destroy all copies of the Advanced Messaging Queue Protocol
-    Specification in your possession or control.
-    
-    Trademarks
-    ==========
-    "JPMorgan", "JPMorgan Chase", "Chase", the JPMorgan Chase logo and the
-    Octagon Symbol are trademarks of JPMorgan Chase & Co.
-    
-    IMATIX and the iMatix logo are trademarks of iMatix Corporation sprl.
-    
-    IONA, IONA Technologies, and the IONA logos are trademarks of IONA
-    Technologies PLC and/or its subsidiaries.
-    
-    LINUX is a trademark of Linus Torvalds. RED HAT and JBOSS are registered
-    trademarks of Red Hat, Inc. in the US and other countries.
-    
-    Java, all Java-based trademarks and OpenOffice.org are trademarks of
-    Sun Microsystems, Inc. in the United States, other countries, or both.
-    
-    Other company, product, or service names may be trademarks or service
-    marks of others.
-    
-    Links to full AMQP specification:
-    =================================
-    http://www.envoytech.org/spec/amq/
-    http://www.iona.com/opensource/amqp/
-    http://www.redhat.com/solutions/specifications/amqp/
-    http://www.twiststandards.org/tiki-index.php?page=AMQ
-    http://www.imatix.com/amqp
--->
-
-<!--
-    <!DOCTYPE amqp SYSTEM "amqp.dtd">
--->
-
-<!-- XML Notes
-
-    We use entities to indicate repetition; attributes to indicate properties.
-
-    We use the 'name' attribute as an identifier, usually within the context
-    of the surrounding entities.
-
-    We use spaces to seperate words in names, so that we can print names in
-    their natural form depending on the context - underlines for source code,
-    hyphens for written text, etc.
-
-    We do not enforce any particular validation mechanism but we support all
-    mechanisms.  The protocol definition conforms to a formal grammar that is
-    published seperately in several technologies.
-
- -->
-
-<amqp major = "0" minor = "9" port = "5672" comment = "AMQ Protocol">
-  <!--
-      ======================================================
-      ==       CONSTANTS
-      ======================================================
-  -->
-  <!-- Frame types -->
-  <constant name = "frame-method"     value = "1" />
-  <constant name = "frame-header"     value = "2" />
-  <constant name = "frame-body"       value = "3" />
-  <constant name = "frame-oob-method" value = "4" />
-  <constant name = "frame-oob-header" value = "5" />
-  <constant name = "frame-oob-body"   value = "6" />
-  <constant name = "frame-trace"      value = "7" />
-  <constant name = "frame-heartbeat"  value = "8" />
-
-  <!-- Protocol constants -->
-  <constant name = "frame-min-size"   value = "4096" />
-  <constant name = "frame-end"        value = "206" />
-
-  <!-- Reply codes -->
-  <constant name = "reply-success" value = "200">
-    <doc>
-      Indicates that the method completed successfully. This reply code is
-      reserved for future use - the current protocol design does not use positive
-      confirmation and reply codes are sent only in case of an error.
-    </doc>
-  </constant>
-
-  <constant name = "not-delivered" value = "310" class = "soft-error">
-    <doc>
-      The client asked for a specific message that is no longer available.
-      The message was delivered to another client, or was purged from the queue
-      for some other reason.
-    </doc>
-  </constant>
-
-  <constant name = "content-too-large" value = "311" class = "soft-error">
-    <doc>
-      The client attempted to transfer content larger than the server could accept
-      at the present time. The client may retry at a later time.
-    </doc>
-  </constant>
-
-  <constant name = "connection-forced" value = "320" class = "hard-error">
-    <doc>
-      An operator intervened to close the connection for some reason. The client
-      may retry at some later date.
-    </doc>
-  </constant>
-
-  <constant name = "invalid-path" value = "402" class = "hard-error">
-    <doc>
-      The client tried to work with an unknown virtual host.
-    </doc>
-  </constant>
-
-  <constant name = "access-refused" value = "403" class = "soft-error">
-    <doc>
-      The client attempted to work with a server entity to which it has no
-      access due to security settings.
-    </doc>
-  </constant>
-
-  <constant name = "not-found" value = "404" class = "soft-error">
-    <doc>The client attempted to work with a server entity that does not exist.</doc>
-  </constant>
-
-  <constant name = "resource-locked" value = "405" class = "soft-error">
-    <doc>
-      The client attempted to work with a server entity to which it has no
-      access because another client is working with it.
-    </doc>
-  </constant>
-
-  <constant name = "precondition-failed" value = "406" class = "soft-error">
-    <doc>
-      The client requested a method that was not allowed because some precondition
-      failed.
-    </doc>
-  </constant>
-
-  <constant name = "frame-error" value = "501" class = "hard-error">
-    <doc>
-      The client sent a malformed frame that the server could not decode. This
-      strongly implies a programming error in the client.
-    </doc>
-  </constant>
-
-  <constant name = "syntax-error" value = "502" class = "hard-error">
-    <doc>
-      The client sent a frame that contained illegal values for one or more
-      fields. This strongly implies a programming error in the client.
-    </doc>
-  </constant>
-
-  <constant name = "command-invalid" value = "503" class = "hard-error">
-    <doc>
-      The client sent an invalid sequence of frames, attempting to perform an
-      operation that was considered invalid by the server. This usually implies
-      a programming error in the client.
-    </doc>
-  </constant>
-
-  <constant name = "channel-error" value = "504" class = "hard-error">
-    <doc>
-      The client attempted to work with a channel that had not been correctly
-      opened. This most likely indicates a fault in the client layer.
-    </doc>
-  </constant>
-
-  <constant name = "resource-error" value = "506" class = "hard-error">
-    <doc>
-      The server could not complete the method because it lacked sufficient
-      resources. This may be due to the client creating too many of some type
-      of entity.
-    </doc>
-  </constant>
-
-  <constant name = "not-allowed" value = "530" class = "hard-error">
-    <doc>
-      The client tried to work with some entity in a manner that is prohibited
-      by the server, due to security settings or by some other criteria.
-    </doc>
-  </constant>
-
-  <constant name = "not-implemented" value = "540" class = "hard-error">
-    <doc>
-      The client tried to use functionality that is not implemented in the
-      server.
-    </doc>
-  </constant>
-
-  <constant name = "internal-error" value = "541" class = "hard-error">
-    <doc>
-      The server could not complete the method because of an internal error.
-      The server may require intervention by an operator in order to resume
-      normal operations.
-    </doc>
-  </constant>
-
-  <constant name = "test-str2" value = "1.2.3.3"/>
-
-  <!--
-      ======================================================
-      ==       DOMAIN TYPES
-      ======================================================
-  -->
-
-  <domain name = "access-ticket" type = "short" label = "access ticket granted by server">
-    <doc>
-      An access ticket granted by the server for a certain set of access rights
-      within a specific realm. Access tickets are valid within the channel where
-      they were created, and expire when the channel closes.
-    </doc>
-    <assert check = "ne" value = "0" />
-  </domain>
-
-  <domain name = "class-id" type = "short" />
-
-  <domain name = "consumer-tag" type = "shortstr" label = "consumer tag">
-    <doc>
-      Identifier for the consumer, valid within the current connection.
-    </doc>
-  </domain>
-
-  <domain name = "delivery-tag" type = "longlong" label = "server-assigned delivery tag">
-    <doc>
-      The server-assigned and channel-specific delivery tag
-    </doc>
-    <rule name = "channel-local">
-      <doc>
-        The delivery tag is valid only within the channel from which the message was
-        received. I.e. a client MUST NOT receive a message on one channel and then
-        acknowledge it on another.
-      </doc>
-    </rule>
-    <rule name = "non-zero">
-      <doc>
-        The server MUST NOT use a zero value for delivery tags. Zero is reserved
-        for client use, meaning "all messages so far received".
-      </doc>
-    </rule>
-  </domain>
-
-  <domain name = "exchange-name" type = "shortstr" label = "exchange name">
-    <doc>
-      The exchange name is a client-selected string that identifies the exchange for publish
-      methods. Exchange names may consist of any mixture of digits, letters, and underscores.
-      Exchange names are scoped by the virtual host.
-    </doc>
-    <assert check = "length" value = "127" />
-  </domain>
-
-  <domain name = "known-hosts" type = "shortstr" label = "list of known hosts">
-    <doc>
-      Specifies the list of equivalent or alternative hosts that the server knows about,
-      which will normally include the current server itself. Clients can cache this
-      information and use it when reconnecting to a server after a failure.  This field
-      may be empty.
-    </doc>
-  </domain>
-
-  <domain name = "method-id" type = "short" />
-
-  <domain name = "no-ack" type = "bit" label = "no acknowledgement needed">
-    <doc>
-      If this field is set the server does not expect acknowledgments for
-      messages. That is, when a message is delivered to the client the server
-      automatically and silently acknowledges it on behalf of the client. This
-      functionality increases performance but at the cost of reliability.
-      Messages can get lost if a client dies before it can deliver them to the
-      application.
-    </doc>
-  </domain>
-
-  <domain name = "no-local" type = "bit" label = "do not deliver own messages">
-    <doc>
-      If the no-local field is set the server will not send messages to the client that
-      published them.
-    </doc>
-  </domain>
-
-  <domain name = "path" type = "shortstr">
-    <doc>
-      Must start with a slash "/" and continue with path names separated by slashes. A path
-      name consists of any combination of at least one of [A-Za-z0-9] plus zero or more of
-      [.-_+!=:].
-    </doc>
-
-    <assert check = "notnull" />
-    <assert check = "syntax" rule = "path" />
-    <assert check = "length" value = "127" />
-  </domain>
-
-  <domain name = "peer-properties" type = "table">
-    <doc>
-      This string provides a set of peer properties, used for identification, debugging, and
-      general information.
-    </doc>
-  </domain>
-
-  <domain name = "queue-name" type = "shortstr" label = "queue name">
-    <doc>
-      The queue name identifies the queue within the vhost. Queue names may consist of any
-      mixture of digits, letters, and underscores.
-    </doc>
-    <assert check = "length" value = "127" />
-  </domain>
-
-  <domain name = "redelivered" type = "bit" label = "message is being redelivered">
-    <doc>
-      This indicates that the message has been previously delivered to this or
-      another client.
-    </doc>
-    <rule name = "implementation">
-      <doc>
-        The server SHOULD try to signal redelivered messages when it can. When
-        redelivering a message that was not successfully acknowledged, the server
-        SHOULD deliver it to the original client if possible.
-      </doc>
-      <doc type = "scenario">
-        Create a shared queue and publish a message to the queue.  Consume the
-        message using explicit acknowledgements, but do not acknowledge the
-        message.  Close the connection, reconnect, and consume from the queue
-        again.  The message should arrive with the redelivered flag set.
-      </doc>
-    </rule>
-    <rule name = "hinting">
-      <doc>
-        The client MUST NOT rely on the redelivered field but should take it as a
-        hint that the message may already have been processed. A fully robust
-        client must be able to track duplicate received messages on non-transacted,
-        and locally-transacted channels.
-      </doc>
-    </rule>
-  </domain>
-
-  <domain name = "reply-code" type = "short" label = "reply code from server">
-    <doc>
-      The reply code. The AMQ reply codes are defined as constants at the start
-      of this formal specification.
-    </doc>
-    <assert check = "notnull" />
-  </domain>
-
-  <domain name = "reply-text" type = "shortstr" label = "localised reply text">
-    <doc>
-      The localised reply text. This text can be logged as an aid to resolving
-      issues.
-    </doc>
-    <assert check = "notnull" />
-  </domain>
-
-  <!-- Elementary domains -->
-  <domain name = "bit"        type = "bit"       label = "single bit" />
-  <domain name = "octet"      type = "octet"     label = "single octet" />
-  <domain name = "short"      type = "short"     label = "16-bit integer" />
-  <domain name = "long"       type = "long"      label = "32-bit integer" />
-  <domain name = "longlong"   type = "longlong"  label = "64-bit integer" />
-  <domain name = "shortstr"   type = "shortstr"  label = "short string" />
-  <domain name = "longstr"    type = "longstr"   label = "long string" />
-  <domain name = "timestamp"  type = "timestamp" label = "64-bit timestamp" />
-  <domain name = "table"      type = "table"     label = "field table" />
-
-  <!-- ==  CONNECTION  ======================================================= -->
-
-  <!-- TODO 0.81 - the 'handler' attribute of methods needs to be reviewed, and if
-       no current implementations use it, removed. /PH 2006/07/20
-       -->
-
-  <class name = "connection" handler = "connection" index = "10" label = "work with socket connections">
-    <doc>
-      The connection class provides methods for a client to establish a network connection to
-      a server, and for both peers to operate the connection thereafter.
-    </doc>
-
-    <doc type = "grammar">
-      connection          = open-connection *use-connection close-connection
-      open-connection     = C:protocol-header
-                            S:START C:START-OK
-                            *challenge
-                            S:TUNE C:TUNE-OK
-                            C:OPEN S:OPEN-OK | S:REDIRECT
-      challenge           = S:SECURE C:SECURE-OK
-      use-connection      = *channel
-      close-connection    = C:CLOSE S:CLOSE-OK
-                          / S:CLOSE C:CLOSE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "start" synchronous = "1" index = "10" label = "start connection negotiation">
-      <doc>
-        This method starts the connection negotiation process by telling the client the
-        protocol version that the server proposes, along with a list of security mechanisms
-        which the client can use for authentication.
-      </doc>
-
-      <rule name = "protocol-name">
-        <doc>
-          If the server cannot support the protocol specified in the protocol header,
-          it MUST close the socket connection without sending any response method.
-        </doc>
-        <doc type = "scenario">
-          The client sends a protocol header containing an invalid protocol name.
-          The server must respond by closing the connection.
-        </doc>
-      </rule>
-      <rule name = "server-support">
-        <doc>
-          The server MUST provide a protocol version that is lower than or equal to
-          that requested by the client in the protocol header.
-        </doc>
-        <doc type = "scenario">
-          The client requests a protocol version that is higher than any valid
-          implementation, e.g. 9.0.  The server must respond with a current
-          protocol version, e.g. 1.0.
-        </doc>
-      </rule>
-      <rule name = "client-support">
-        <doc>
-          If the client cannot handle the protocol version suggested by the server
-          it MUST close the socket connection.
-        </doc>
-        <doc type = "scenario">
-          The server sends a protocol version that is lower than any valid
-          implementation, e.g. 0.1.  The client must respond by closing the
-          connection.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-      <response name = "start-ok" />
-
-      <field name = "version-major" domain = "octet" label = "protocol major version">
-        <doc>
-          The version of the protocol, expressed in protocol units of 0.1 public
-          versions and properly printed as two digits with a leading zero. I.e. a
-          protocol version of "09" represents a public version "0.9".  The decimal
-          shift allows the correct expression of pre-1.0 protocol releases.
-        </doc>
-        <doc type = "todo">
-          This field should be renamed to "protocol version".
-        </doc>
-      </field>
-
-      <field name = "version-minor" domain = "octet" label = "protocol major version">
-        <doc>
-          The protocol revision, expressed as an integer from 0 to 9.  The use of more
-          than ten revisions is discouraged.  The public version string is constructed
-          from the protocol version and revision as follows: we print the protocol
-          version with one decimal position, and we append the protocol revision. A
-          version=10 and revision=2 are printed as "1.02".
-        </doc>
-        <doc type = "todo">
-          This field should be renamed to "protocol revision".
-        </doc>
-      </field>
-
-      <field name = "server-properties" domain = "peer-properties" label = "server properties">
-        <rule name = "required-fields">
-          <doc>
-            The properties SHOULD contain at least these fields: "host", specifying the
-            server host name or address, "product", giving the name of the server product,
-            "version", giving the name of the server version, "platform", giving the name
-            of the operating system, "copyright", if appropriate, and "information", giving
-            other general information.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and inspects the server properties. It checks for
-            the presence of the required fields.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "mechanisms" domain = "longstr" label = "available security mechanisms">
-        <doc>
-          A list of the security mechanisms that the server supports, delimited by spaces.
-          Currently ASL supports these mechanisms: PLAIN.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "locales" domain = "longstr" label = "available message locales">
-        <doc>
-          A list of the message locales that the server supports, delimited by spaces. The
-          locale defines the language in which the server will send reply texts.
-        </doc>
-        <rule name = "required-support">
-          <doc>
-            The server MUST support at least the en_US locale.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and inspects the locales field. It checks for
-            the presence of the required locale(s).
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <method name = "start-ok" synchronous = "1" index = "11"
-      label = "select security mechanism and locale">
-      <doc>
-        This method selects a SASL security mechanism. ASL uses SASL (RFC2222) to
-        negotiate authentication and encryption.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "client-properties" domain = "peer-properties" label = "client properties">
-        <rule name = "required-fields">
-          <!-- This rule is not testable from the client side -->
-          <doc>
-            The properties SHOULD contain at least these fields: "product", giving the name
-            of the client product, "version", giving the name of the client version, "platform",
-            giving the name of the operating system, "copyright", if appropriate, and
-            "information", giving other general information.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "mechanism" domain = "shortstr" label = "selected security mechanism">
-        <doc>
-          A single security mechanisms selected by the client, which must be one of those
-          specified by the server.
-        </doc>
-        <rule name = "security">
-          <doc>
-            The client SHOULD authenticate using the highest-level security profile it
-            can handle from the list provided by the server.
-          </doc>
-        </rule>
-        <rule name = "validity">
-          <doc>
-            If the mechanism field does not contain one of the security mechanisms
-            proposed by the server in the Start method, the server MUST close the
-            connection without sending any further data.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and sends an invalid security mechanism. The
-            server must respond by closing the connection (a socket close, with no
-            connection close negotiation).
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "response" domain = "longstr" label = "security response data">
-        <doc>
-          A block of opaque data passed to the security mechanism. The contents of this
-          data are defined by the SASL security mechanism.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "locale" domain = "shortstr" label = "selected message locale">
-        <doc>
-          A single message local selected by the client, which must be one of those
-          specified by the server.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "secure" synchronous = "1" index = "20" label = "security mechanism challenge">
-      <doc>
-        The SASL protocol works by exchanging challenges and responses until both peers have
-        received sufficient information to authenticate each other. This method challenges
-        the client to provide more information.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-      <response name = "secure-ok" />
-
-      <field name = "challenge" domain = "longstr" label = "security challenge data">
-        <doc>
-          Challenge information, a block of opaque binary data passed to the security
-          mechanism.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "secure-ok" synchronous = "1" index = "21" label = "security mechanism response">
-      <doc>
-        This method attempts to authenticate, passing a block of SASL data for the security
-        mechanism at the server side.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "response" domain = "longstr" label = "security response data">
-        <doc>
-          A block of opaque data passed to the security mechanism. The contents of this
-          data are defined by the SASL security mechanism.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "tune" synchronous = "1" index = "30"
-      label = "propose connection tuning parameters">
-      <doc>
-        This method proposes a set of connection configuration values to the client. The
-        client can accept and/or adjust these.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <response name = "tune-ok" />
-
-      <field name = "channel-max" domain = "short" label = "proposed maximum channels">
-        <doc>
-          The maximum total number of channels that the server allows per connection. Zero
-          means that the server does not impose a fixed limit, but the number of allowed
-          channels may be limited by available server resources.
-        </doc>
-      </field>
-
-      <field name = "frame-max" domain = "long" label = "proposed maximum frame size">
-        <doc>
-          The largest frame size that the server proposes for the connection. The client
-          can negotiate a lower value. Zero means that the server does not impose any
-          specific limit but may reject very large frames if it cannot allocate resources
-          for them.
-        </doc>
-        <rule name = "minimum">
-          <doc>
-            Until the frame-max has been negotiated, both peers MUST accept frames of up
-            to frame-min-size octets large, and the minimum negotiated value for frame-max
-            is also frame-min-size.
-          </doc>
-          <doc type = "scenario">
-            Client connects to server and sends a large properties field, creating a frame
-            of frame-min-size octets.  The server must accept this frame.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "heartbeat" domain = "short" label = "desired heartbeat delay">
-        <!-- TODO 0.82 - the heartbeat negotiation mechanism was changed during
-             implementation because the model documented here does not actually
-             work properly.  The best model we found is that the server proposes
-             a heartbeat value to the client; the client can reply with zero, meaning
-             'do not use heartbeats (as documented here), or can propose its own
-             heartbeat value, which the server should then accept.  This is different
-             from the model here which is disconnected - e.g. each side requests a
-             heartbeat independently.  Basically a connection is heartbeated in
-             both ways, or not at all, depending on whether both peers support
-             heartbeating or not, and the heartbeat value should itself be chosen
-             by the client so that remote links can get a higher value.  Also, the
-             actual heartbeat mechanism needs documentation, and is as follows: so
-             long as there is activity on a connection - in or out - both peers
-             assume the connection is active.  When there is no activity, each peer
-             must send heartbeat frames.  When no heartbeat frame is received after
-             N cycles (where N is at least 2), the connection can be considered to
-             have died. /PH 2006/07/19
-             -->
-        <doc>
-          The delay, in seconds, of the connection heartbeat that the server wants.
-          Zero means the server does not want a heartbeat.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "tune-ok" synchronous = "1" index = "31"
-      label = "negotiate connection tuning parameters">
-      <doc>
-        This method sends the client's connection tuning parameters to the server.
-        Certain fields are negotiated, others provide capability information.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "channel-max" domain = "short" label = "negotiated maximum channels">
-        <doc>
-          The maximum total number of channels that the client will use per connection.
-        </doc>
-        <rule name = "upper-limit">
-          <doc>
-            If the client specifies a channel max that is higher than the value provided
-            by the server, the server MUST close the connection without attempting a
-            negotiated close.  The server may report the error in some fashion to assist
-            implementors.
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-        <assert check = "le" method = "tune" field = "channel-max" />
-      </field>
-
-      <field name = "frame-max" domain = "long" label = "negotiated maximum frame size">
-        <doc>
-          The largest frame size that the client and server will use for the connection.
-          Zero means that the client does not impose any specific limit but may reject
-          very large frames if it cannot allocate resources for them. Note that the
-          frame-max limit applies principally to content frames, where large contents can
-          be broken into frames of arbitrary size.
-        </doc>
-        <rule name = "minimum">
-          <doc>
-            Until the frame-max has been negotiated, both peers MUST accept frames of up
-            to frame-min-size octets large, and the minimum negotiated value for frame-max
-            is also frame-min-size.
-          </doc>
-        </rule>
-        <rule name = "upper-limit">
-          <doc>
-            If the client specifies a frame max that is higher than the value provided
-            by the server, the server MUST close the connection without attempting a
-            negotiated close. The server may report the error in some fashion to assist
-            implementors.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "heartbeat" domain = "short" label = "desired heartbeat delay">
-        <doc>
-          The delay, in seconds, of the connection heartbeat that the client wants. Zero
-          means the client does not want a heartbeat.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "open" synchronous = "1" index = "40" label = "open connection to virtual host">
-      <doc>
-        This method opens a connection to a virtual host, which is a collection of
-        resources, and acts to separate multiple application domains within a server.
-        The server may apply arbitrary limits per virtual host, such as the number
-        of each type of entity that may be used, per connection and/or in total.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "open-ok" />
-      <response name = "redirect" />
-
-      <field name = "virtual-host" domain = "path" label = "virtual host name">
-        <!-- TODO 0.82 - the entire vhost model needs review. This concept was
-             prompted by the HTTP vhost concept but does not fit very well into
-             AMQP.  Currently we use the vhost as a "cluster identifier" which is
-             inaccurate usage. /PH 2006/07/19
-             -->
-        <assert check = "regexp" value = "^[a-zA-Z0-9/-_]+$" />
-        <doc>
-          The name of the virtual host to work with.
-        </doc>
-        <rule name = "separation">
-          <doc>
-            If the server supports multiple virtual hosts, it MUST enforce a full
-            separation of exchanges, queues, and all associated entities per virtual
-            host. An application, connected to a specific virtual host, MUST NOT be able
-            to access resources of another virtual host.
-          </doc>
-        </rule>
-        <rule name = "security">
-          <doc>
-            The server SHOULD verify that the client has permission to access the
-            specified virtual host.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "capabilities" domain = "shortstr" label = "required capabilities">
-        <doc>
-          The client can specify zero or more capability names, delimited by spaces.
-          The server can use this string to how to process the client's connection
-          request.
-        </doc>
-      </field>
-
-      <field name = "insist" domain = "bit" label = "insist on connecting to server">
-        <doc>
-          In a configuration with multiple collaborating servers, the server may respond
-          to a Connection.Open method with a Connection.Redirect. The insist option tells
-          the server that the client is insisting on a connection to the specified server.
-        </doc>
-        <rule name = "behaviour">
-          <doc>
-            When the client uses the insist option, the server MUST NOT respond with a
-            Connection.Redirect method.  If it cannot accept the client's connection
-            request it should respond by closing the connection with a suitable reply
-            code.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "open-ok" synchronous = "1" index = "41" label = "signal that connection is ready">
-      <doc>
-        This method signals to the client that the connection is ready for use.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "known-hosts" domain = "known-hosts" />
-    </method>
-
-    <method name = "redirect" synchronous = "1" index = "42" label = "redirects client to other server">
-      <doc>
-        This method redirects the client to another server, based on the requested virtual
-        host and/or capabilities.
-      </doc>
-      <rule name = "usage">
-        <doc>
-          When getting the Connection.Redirect method, the client SHOULD reconnect to
-          the host specified, and if that host is not present, to any of the hosts
-          specified in the known-hosts list.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "host" domain = "shortstr" label = "server to connect to">
-        <doc>
-          Specifies the server to connect to. This is an IP address or a DNS name,
-          optionally followed by a colon and a port number. If no port number is
-          specified, the client should use the default port number for the protocol.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-      <field name = "known-hosts" domain = "known-hosts" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "close" synchronous = "1" index = "50" label = "request a connection close">
-      <doc>
-        This method indicates that the sender wants to close the connection. This may be
-        due to internal conditions (e.g. a forced shut-down) or due to an error handling
-        a specific method, i.e. an exception. When a close is due to an exception, the
-        sender provides the class and method id of the method which caused the exception.
-      </doc>
-      <!-- TODO: the connection close mechanism needs to be reviewed from the ODF
-           documentation and better expressed as rules here. /PH 2006/07/20
-           -->
-      <rule name = "stability">
-        <doc>
-          After sending this method any received method except the Close-OK method MUST
-          be discarded.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-      <response name = "close-ok" />
-
-      <field name = "reply-code" domain = "reply-code" />
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "class-id" domain = "class-id" label = "failing method class">
-        <doc>
-          When the close is provoked by a method exception, this is the class of the
-          method.
-        </doc>
-      </field>
-
-      <field name = "method-id" domain = "method-id" label = "failing method ID">
-        <doc>
-          When the close is provoked by a method exception, this is the ID of the method.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "close-ok" synchronous = "1" index = "51" label = "confirm a connection close">
-      <doc>
-        This method confirms a Connection.Close method and tells the recipient that it is
-        safe to release resources for the connection and close the socket.
-      </doc>
-      <rule name = "reporting">
-        <doc>
-          A peer that detects a socket closure without having received a Close-Ok
-          handshake method SHOULD log the error.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  CHANNEL  ========================================================== -->
-
-  <class name = "channel" handler = "channel" index = "20" label = "work with channels">
-    <doc>
-      The channel class provides methods for a client to establish a channel to a
-      server and for both peers to operate the channel thereafter.
-    </doc>
-
-    <doc type = "grammar">
-      channel             = open-channel *use-channel close-channel
-      open-channel        = C:OPEN S:OPEN-OK
-      use-channel         = C:FLOW S:FLOW-OK
-                          / S:FLOW C:FLOW-OK
-                          / S:ALERT
-                          / functional-class
-      close-channel       = C:CLOSE S:CLOSE-OK
-                          / S:CLOSE C:CLOSE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "open" synchronous = "1" index = "10" label = "open a channel for use">
-      <doc>
-        This method opens a channel to the server.
-      </doc>
-      <rule name = "state" on-failure = "channel-error">
-        <doc>
-          The client MUST NOT use this method on an alread-opened channel.
-        </doc>
-        <doc type = "scenario">
-          Client opens a channel and then reopens the same channel.
-        </doc>
-      </rule>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "open-ok" />
-      <field name = "out of band" domain = "shortstr" label = "out-of-band settings">
-        <doc>
-          Configures out-of-band transfers on this channel. The syntax and meaning of this
-          field will be formally defined at a later date.
-        </doc>
-        <assert check = "null" />
-      </field>
-    </method>
-
-    <method name = "open-ok" synchronous = "1" index = "11" label = "signal that the channel is ready">
-      <doc>
-        This method signals to the client that the channel is ready for use.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "flow" synchronous = "1" index = "20" label = "enable/disable flow from peer">
-      <doc>
-        This method asks the peer to pause or restart the flow of content data. This is a
-        simple flow-control mechanism that a peer can use to avoid oveflowing its queues or
-        otherwise finding itself receiving more messages than it can process. Note that this
-        method is not intended for window control. The peer that receives a disable flow
-        method should finish sending the current content frame, if any, then pause.
-      </doc>
-
-      <rule name = "initial-state">
-        <doc>
-          When a new channel is opened, it is active (flow is active). Some applications
-          assume that channels are inactive until started. To emulate this behaviour a
-          client MAY open the channel, then pause it.
-        </doc>
-      </rule>
-
-      <rule name = "bidirectional">
-        <doc>
-          When sending content frames, a peer SHOULD monitor the channel for incoming
-          methods and respond to a Channel.Flow as rapidly as possible.
-        </doc>
-      </rule>
-
-      <rule name = "throttling">
-        <doc>
-          A peer MAY use the Channel.Flow method to throttle incoming content data for
-          internal reasons, for example, when exchanging data over a slower connection.
-        </doc>
-      </rule>
-
-      <rule name = "expected-behaviour">
-        <doc>
-          The peer that requests a Channel.Flow method MAY disconnect and/or ban a peer
-          that does not respect the request.  This is to prevent badly-behaved clients
-          from overwhelming a broker.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-
-      <response name = "flow-ok" />
-
-      <field name = "active" domain = "bit" label = "start/stop content frames">
-        <doc>
-          If 1, the peer starts sending content frames. If 0, the peer stops sending
-          content frames.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "flow-ok" index = "21" label = "confirm a flow method">
-      <doc>
-        Confirms to the peer that a flow command was received and processed.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-      <field name = "active" domain = "bit" label = "current flow setting">
-        <doc>
-          Confirms the setting of the processed flow method: 1 means the peer will start
-          sending or continue to send content frames; 0 means it will not.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- TODO 0.82 - remove this method entirely
-        /PH 2006/07/20
-        -->
-    <method name = "alert" index = "30" label = "send a non-fatal warning message">
-      <doc>
-        This method allows the server to send a non-fatal warning to the client. This is
-        used for methods that are normally asynchronous and thus do not have confirmations,
-        and for which the server may detect errors that need to be reported. Fatal errors
-        are handled as channel or connection exceptions; non-fatal errors are sent through
-        this method.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "reply-code" domain = "reply-code" />
-      <field name = "reply-text" domain = "reply-text" />
-      <field name = "details" domain = "table" label = "detailed information for warning">
-        <doc>
-          A set of fields that provide more information about the problem. The meaning of
-          these fields are defined on a per-reply-code basis (TO BE DEFINED).
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "close" synchronous = "1" index = "40" label = "request a channel close">
-      <doc>
-        This method indicates that the sender wants to close the channel. This may be due to
-        internal conditions (e.g. a forced shut-down) or due to an error handling a specific
-        method, i.e. an exception. When a close is due to an exception, the sender provides
-        the class and method id of the method which caused the exception.
-      </doc>
-
-      <!-- TODO: the channel close behaviour needs to be reviewed from the ODF
-           documentation and better expressed as rules here. /PH 2006/07/20
-           -->
-      <rule name = "stability">
-        <doc>
-          After sending this method any received method except the Close-OK method MUST
-          be discarded.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-      <response name = "close-ok" />
-
-      <field name = "reply-code" domain = "reply-code" />
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "class-id" domain = "class-id" label = "failing method class">
-        <doc>
-          When the close is provoked by a method exception, this is the class of the
-          method.
-        </doc>
-      </field>
-
-      <field name = "method-id" domain = "method-id" label = "failing method ID">
-        <doc>
-          When the close is provoked by a method exception, this is the ID of the method.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "close-ok" synchronous = "1" index = "41" label = "confirm a channel close">
-      <doc>
-        This method confirms a Channel.Close method and tells the recipient that it is safe
-        to release resources for the channel and close the socket.
-      </doc>
-      <rule name = "reporting">
-        <doc>
-          A peer that detects a socket closure without having received a Channel.Close-Ok
-          handshake method SHOULD log the error.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <chassis name = "server" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  ACCESS  =========================================================== -->
-
-  <!-- TODO 0.82 - this class must be implemented by two teams before we can
-       consider it matured.
-    -->
-
-  <class name = "access" handler = "connection" index = "30" label = "work with access tickets">
-    <doc>
-      The protocol control access to server resources using access tickets. A
-      client must explicitly request access tickets before doing work. An access
-      ticket grants a client the right to use a specific set of resources -
-      called a "realm" - in specific ways.
-    </doc>
-
-    <doc type = "grammar">
-      access              = C:REQUEST S:REQUEST-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "request" synchronous = "1" index = "10" label = "request an access ticket">
-      <doc>
-        This method requests an access ticket for an access realm. The server
-        responds by granting the access ticket. If the client does not have
-        access rights to the requested realm this causes a connection exception.
-        Access tickets are a per-channel resource.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "request-ok" />
-
-      <field name = "realm" domain = "shortstr" label = "name of requested realm">
-        <doc>
-          Specifies the name of the realm to which the client is requesting access.
-          The realm is a configured server-side object that collects a set of
-          resources (exchanges, queues, etc.).  If the channel has already requested
-          an access ticket onto this realm, the previous ticket is destroyed and a
-          new ticket is created with the requested access rights, if allowed.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST specify a realm that is known to the server.  The server
-            makes an identical response for undefined realms as it does for realms
-            that are defined but inaccessible to this client.
-          </doc>
-          <doc type = "scenario">
-            Client specifies an undefined realm.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive access to the realm, meaning that this will be the only
-          channel that uses the realm's resources.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MAY NOT request exclusive access to a realm that has active
-            access tickets, unless the same channel already had the only access
-            ticket onto that realm.
-          </doc>
-          <doc type = "scenario">
-            Client opens two channels and requests exclusive access to the same realm.
-          </doc>
-        </rule>
-      </field>
-      <field name = "passive" domain = "bit" label = "request passive access">
-        <doc>
-          Request message passive access to the specified access realm. Passive
-          access lets a client get information about resources in the realm but
-          not to make any changes to them.
-        </doc>
-      </field>
-      <field name = "active" domain = "bit" label = "request active access">
-        <doc>
-          Request message active access to the specified access realm. Active access lets
-          a client get create and delete resources in the realm.
-        </doc>
-      </field>
-      <field name = "write" domain = "bit" label = "request write access">
-        <doc>
-          Request write access to the specified access realm. Write access lets a client
-          publish messages to all exchanges in the realm.
-        </doc>
-      </field>
-      <field name = "read" domain = "bit" label = "request read access">
-        <doc>
-          Request read access to the specified access realm. Read access lets a client
-          consume messages from queues in the realm.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "request-ok" synchronous = "1" index = "11" label = "grant access to server resources">
-      <doc>
-        This method provides the client with an access ticket. The access ticket is valid
-        within the current channel and for the lifespan of the channel.
-      </doc>
-      <rule name = "per-channel" on-failure = "not-allowed">
-        <doc>
-          The client MUST NOT use access tickets except within the same channel as
-          originally granted.
-        </doc>
-        <doc type = "scenario">
-          Client opens two channels, requests a ticket on one channel, and then
-          tries to use that ticket in a seconc channel.
-        </doc>
-      </rule>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "ticket" domain = "access-ticket" />
-    </method>
-  </class>
-
-  <!-- ==  EXCHANGE  ========================================================= -->
-
-  <class name = "exchange" handler = "channel" index = "40" label = "work with exchanges">
-    <doc>
-      Exchanges match and distribute messages across queues. Exchanges can be configured in
-      the server or created at runtime.
-    </doc>
-
-    <doc type = "grammar">
-      exchange            = C:DECLARE  S:DECLARE-OK
-                          / C:DELETE   S:DELETE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <rule name = "required-types">
-      <doc>
-        The server MUST implement these standard exchange types: fanout, direct.
-      </doc>
-      <doc type = "scenario">
-        Client attempts to declare an exchange with each of these standard types.
-      </doc>
-    </rule>
-    <rule name = "recommended-types">
-      <doc>
-        The server SHOULD implement these standard exchange types: topic, headers.
-      </doc>
-      <doc type = "scenario">
-        Client attempts to declare an exchange with each of these standard types.
-      </doc>
-    </rule>
-    <rule name = "required-instances">
-      <doc>
-        The server MUST, in each virtual host, pre-declare an exchange instance
-        for each standard exchange type that it implements, where the name of the
-        exchange instance is "amq." followed by the exchange type name.
-      </doc>
-      <doc type = "scenario">
-        Client creates a temporary queue and attempts to bind to each required
-        exchange instance (amq.fanout, amq.direct, and amq.topic, amq.headers if
-        those types are defined).
-      </doc>
-    </rule>
-    <rule name = "default-exchange">
-      <doc>
-        The server MUST predeclare a direct exchange to act as the default exchange
-        for content Publish methods and for default queue bindings.
-      </doc>
-      <doc type = "scenario">
-        Client checks that the default exchange is active by specifying a queue
-        binding with no exchange name, and publishing a message with a suitable
-        routing key but without specifying the exchange name, then ensuring that
-        the message arrives in the queue correctly.
-      </doc>
-    </rule>
-    <rule name = "default-access">
-      <doc>
-        The server MUST NOT allow clients to access the default exchange except
-        by specifying an empty exchange name in the Queue.Bind and content Publish
-        methods.
-      </doc>
-    </rule>
-    <rule name = "extensions">
-      <doc>
-        The server MAY implement other exchange types as wanted.
-      </doc>
-    </rule>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "declare" synchronous = "1" index = "10" label = "declare exchange, create if needed">
-      <doc>
-        This method creates an exchange if it does not already exist, and if the exchange
-        exists, verifies that it is of the correct and expected class.
-      </doc>
-      <rule name = "minimum">
-        <doc>
-          The server SHOULD support a minimum of 16 exchanges per virtual host and
-          ideally, impose no limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          The client creates as many exchanges as it can until the server reports
-          an error; the number of exchanges successfuly created must be at least
-          sixteen.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "declare-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          When a client defines a new exchange, this belongs to the access realm of the
-          ticket used. All further work done with that exchange must be done with an
-          access ticket for the same realm.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "active" access to
-            the realm in which the exchange exists or will be created, or "passive"
-            access if the if-exists flag is set.
-          </doc>
-          <doc type = "scenario">
-            Client creates access ticket with wrong access rights and attempts to use
-            in this method.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <rule name = "reserved" on-failure = "access-refused">
-          <doc>
-            Exchange names starting with "amq." are reserved for predeclared and
-            standardised exchanges. The client MUST NOT attempt to create an exchange
-            starting with "amq.".
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <assert check = "regexp" value = "^[a-zA-Z0-9-_.:]+$" />
-      </field>
-
-      <field name = "type" domain = "shortstr" label = "exchange type">
-        <doc>
-          Each exchange belongs to one of a set of exchange types implemented by the
-          server. The exchange types define the functionality of the exchange - i.e. how
-          messages are routed through it. It is not valid or meaningful to attempt to
-          change the type of an existing exchange.
-        </doc>
-        <rule name = "typed" on-failure = "not-allowed">
-          <doc>
-            Exchanges cannot be redeclared with different types.  The client MUST not
-            attempt to redeclare an existing exchange with a different type than used
-            in the original Exchange.Declare method.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <rule name = "support" on-failure = "command-invalid">
-          <doc>
-            The client MUST NOT attempt to create an exchange with a type that the
-            server does not support.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <assert check = "regexp" value = "^[a-zA-Z0-9-_.:]+$" />
-      </field>
-
-      <field name = "passive" domain = "bit" label = "do not create exchange">
-        <doc>
-          If set, the server will not create the exchange. The client can use this to
-          check whether an exchange exists without modifying the server state.
-        </doc>
-        <rule name = "not-found">
-          <doc>
-            If set, and the exchange does not already exist, the server MUST raise a
-            channel exception with reply code 404 (not found).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "durable" domain = "bit" label = "request a durable exchange">
-        <doc>
-          If set when creating a new exchange, the exchange will be marked as durable.
-          Durable exchanges remain active when a server restarts. Non-durable exchanges
-          (transient exchanges) are purged if/when a server restarts.
-        </doc>
-        <rule name = "support">
-          <doc>
-            The server MUST support both durable and transient exchanges.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-        <rule name = "sticky">
-          <doc>
-            The server MUST ignore the durable field if the exchange already exists.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <!-- TODO 0.82 - clarify how this works; there is no way to cancel a binding
-           except by deleting a queue.
-         -->
-      <field name = "auto-delete" domain = "bit" label = "auto-delete when unused">
-        <doc>
-          If set, the exchange is deleted when all queues have finished using it.
-        </doc>
-        <rule name = "sticky">
-          <doc>
-            The server MUST ignore the auto-delete field if the exchange already
-            exists.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "internal" domain = "bit" label = "create internal exchange">
-        <doc>
-          If set, the exchange may not be used directly by publishers, but only when bound
-          to other exchanges. Internal exchanges are used to construct wiring that is not
-          visible to applications.
-        </doc>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-
-      <field name = "arguments" domain = "table" label = "arguments for declaration">
-        <doc>
-          A set of arguments for the declaration. The syntax and semantics of these
-          arguments depends on the server implementation. This field is ignored if passive
-          is 1.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "declare-ok" synchronous = "1" index = "11" label = "confirm exchange declaration">
-      <doc>
-        This method confirms a Declare method and confirms the name of the exchange,
-        essential for automatically-named exchanges.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "delete" synchronous = "1" index = "20" label = "delete an exchange">
-      <doc>
-        This method deletes an exchange. When an exchange is deleted all queue bindings on
-        the exchange are cancelled.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "delete-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "active" access
-            rights to the exchange's access realm.
-          </doc>
-          <doc type = "scenario">
-            Client creates access ticket with wrong access rights and attempts to use
-            in this method.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <rule name = "exists" on-failure = "not-found">
-          <doc>
-            The client MUST NOT attempt to delete an exchange that does not exist.
-          </doc>
-        </rule>
-        <assert check = "notnull" />
-      </field>
-
-      <!-- TODO 0.82 - discuss whether this option is useful or not.  I don't have
-           any real use case for it. /PH 2006-07-23.
-         -->
-      <field name = "if-unused" domain = "bit" label = "delete only if unused">
-        <doc>
-          If set, the server will only delete the exchange if it has no queue bindings. If
-          the exchange has queue bindings the server does not delete it but raises a
-          channel exception instead.
-        </doc>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "delete-ok" synchronous = "1" index = "21"
-      label = "confirm deletion of an exchange">
-      <doc>This method confirms the deletion of an exchange.</doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  QUEUE  ============================================================ -->
-
-  <class name = "queue" handler = "channel" index = "50" label = "work with queues">
-    <doc>
-      Queues store and forward messages. Queues can be configured in the server or created at
-      runtime. Queues must be attached to at least one exchange in order to receive messages
-      from publishers.
-    </doc>
-
-    <doc type = "grammar">
-      queue               = C:DECLARE  S:DECLARE-OK
-                          / C:BIND     S:BIND-OK
-                          / C:PURGE    S:PURGE-OK
-                          / C:DELETE   S:DELETE-OK
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MUST" />
-
-    <rule name = "any-content">
-      <doc>
-        A server MUST allow any content class to be sent to any queue, in any mix, and
-        queue and deliver these content classes independently. Note that all methods
-        that fetch content off queues are specific to a given content class.
-      </doc>
-      <doc type = "scenario">
-        Client creates an exchange of each standard type and several queues that
-        it binds to each exchange. It must then sucessfully send each of the standard
-        content types to each of the available queues.
-      </doc>
-    </rule>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "declare" synchronous = "1" index = "10" label = "declare queue, create if needed">
-      <doc>
-        This method creates or checks a queue. When creating a new queue the client can
-        specify various properties that control the durability of the queue and its
-        contents, and the level of sharing for the queue.
-      </doc>
-
-      <rule name = "default-binding">
-        <doc>
-          The server MUST create a default binding for a newly-created queue to the
-          default exchange, which is an exchange of type 'direct'.
-        </doc>
-        <doc type = "scenario">
-          Client creates a new queue, and then without explicitly binding it to an
-          exchange, attempts to send a message through the default exchange binding,
-          i.e. publish a message to the empty exchange, with the queue name as routing
-          key.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_35" -->
-      <rule name = "minimum-queues">
-        <doc>
-          The server SHOULD support a minimum of 256 queues per virtual host and ideally,
-          impose no limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          Client attempts to create as many queues as it can until the server reports
-          an error.  The resulting count must at least be 256.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "declare-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          When a client defines a new queue, this belongs to the access realm of the
-          ticket used. All further work done with that queue must be done with an access
-          ticket for the same realm.
-        </doc>
-        <rule name = "validity" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "active" access to
-            the realm in which the queue exists or will be created.
-          </doc>
-          <doc type = "scenario">
-            Client creates access ticket with wrong access rights and attempts to use
-            in this method.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <rule name = "default-name">
-          <doc>
-            The queue name MAY be empty, in which case the server MUST create a new
-            queue with a unique generated name and return this to the client in the
-            Declare-Ok method.
-          </doc>
-          <doc type = "scenario">
-            Client attempts to create several queues with an empty name. The client then
-            verifies that the server-assigned names are unique and different.
-          </doc>
-        </rule>
-        <rule name = "reserved-prefix" on-failure = "not-allowed">
-          <doc>
-            Queue names starting with "amq." are reserved for predeclared and
-            standardised server queues. A client MAY NOT attempt to declare a queue with a
-            name  that starts with "amq." and the passive option set to zero.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to create a queue with a name starting with "amq." and with
-            the passive option set to zero.
-          </doc>
-        </rule>
-        <assert check = "regexp" value = "^[a-zA-Z0-9-_.:]*$" />
-      </field>
-
-      <field name = "passive" domain = "bit" label = "do not create queue">
-        <doc>
-          If set, the server will not create the queue. This field allows the client
-          to assert the presence of a queue without modifying the server state.
-        </doc>
-        <rule name = "passive" on-failure = "not-found">
-          <doc>
-            The client MAY ask the server to assert that a queue exists without
-            creating the queue if not.  If the queue does not exist, the server
-            treats this as a failure.
-          </doc>
-          <doc type = "scenario">
-            Client declares an existing queue with the passive option and expects
-            the server to respond with a declare-ok. Client then attempts to declare
-            a non-existent queue with the passive option, and the server must close
-            the channel with the correct reply-code.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "durable" domain = "bit" label = "request a durable queue">
-        <doc>
-          If set when creating a new queue, the queue will be marked as durable. Durable
-          queues remain active when a server restarts. Non-durable queues (transient
-          queues) are purged if/when a server restarts. Note that durable queues do not
-          necessarily hold persistent messages, although it does not make sense to send
-          persistent messages to a transient queue.
-        </doc>
-        <!-- Rule test name: was "amq_queue_03" -->
-        <rule name = "persistence">
-          <doc>The server MUST recreate the durable queue after a restart.</doc>
-
-          <!-- TODO: use 'client does something' rather than 'a client does something'. -->
-          <doc type = "scenario">
-            A client creates a durable queue. The server is then restarted. The client
-            then attempts to send a message to the queue. The message should be successfully
-            delivered.
-          </doc>
-        </rule>
-        <!-- Rule test name: was "amq_queue_36" -->
-        <rule name = "types">
-          <doc>The server MUST support both durable and transient queues.</doc>
-          <doc type = "scenario">
-            A client creates two named queues, one durable and one transient.
-          </doc>
-        </rule>
-        <!-- Rule test name: was "amq_queue_37" -->    
-        <rule name = "pre-existence">
-          <doc>The server MUST ignore the durable field if the queue already exists.</doc>
-          <doc type = "scenario">
-            A client creates two named queues, one durable and one transient. The client
-            then attempts to declare the two queues using the same names again, but reversing
-            the value of the durable flag in each case. Verify that the queues still exist
-            with the original durable flag values.
-            <!-- TODO: but how? -->
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exclusive" domain = "bit" label = "request an exclusive queue">
-        <doc>
-          Exclusive queues may only be consumed from by the current connection. Setting
-          the 'exclusive' flag always implies 'auto-delete'.
-        </doc>
-
-        <!-- Rule test name: was "amq_queue_38" -->
-        <rule name = "types">
-          <doc>
-            The server MUST support both exclusive (private) and non-exclusive (shared)
-            queues.
-          </doc>
-          <doc type = "scenario">
-            A client creates two named queues, one exclusive and one non-exclusive.
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_queue_04" -->    
-        <rule name = "02" on-failure = "channel-error">
-          <doc>
-            The client MAY NOT attempt to declare any existing and exclusive queue
-            on multiple connections.
-          </doc>
-          <doc type = "scenario">
-            A client declares an exclusive named queue. A second client on a different
-            connection attempts to declare a queue of the same name.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "auto-delete" domain = "bit" label = "auto-delete queue when unused">
-        <doc>
-          If set, the queue is deleted when all consumers have finished using it. Last
-          consumer can be cancelled either explicitly or because its channel is closed. If
-          there was no consumer ever on the queue, it won't be deleted.
-        </doc>
-
-        <!-- Rule test name: was "amq_queue_31" -->
-        <rule name = "pre-existence">
-          <doc>
-            The server MUST ignore the auto-delete field if the queue already exists.
-          </doc>
-          <doc type = "scenario">
-            A client creates two named queues, one as auto-delete and one explicit-delete.
-            The client then attempts to declare the two queues using the same names again,
-            but reversing the value of the auto-delete field in each case. Verify that the
-            queues still exist with the original auto-delete flag values.
-            <!-- TODO: but how? -->
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-
-      <field name = "arguments" domain = "table" label = "arguments for declaration">
-        <doc>
-          A set of arguments for the declaration. The syntax and semantics of these
-          arguments depends on the server implementation. This field is ignored if passive
-          is 1.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "declare-ok" synchronous = "1" index = "11" label = "confirms a queue definition">
-      <doc>
-        This method confirms a Declare method and confirms the name of the queue, essential
-        for automatically-named queues.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Reports the name of the queue. If the server generated a queue name, this field
-          contains that name.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-
-      <field name = "message-count" domain = "long" label = "number of messages in queue">
-        <doc>
-          Reports the number of messages in the queue, which will be zero for
-          newly-created queues.
-        </doc>
-      </field>
-      
-      <field name = "consumer-count" domain = "long" label = "number of consumers">
-        <doc>
-          Reports the number of active consumers for the queue. Note that consumers can
-          suspend activity (Channel.Flow) in which case they do not appear in this count.
-        </doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "bind" synchronous = "1" index = "20" label = "bind queue to an exchange">
-      <doc>
-        This method binds a queue to an exchange. Until a queue is bound it will not receive
-        any messages. In a classic messaging model, store-and-forward queues are bound to a
-        dest exchange and subscription queues are bound to a dest_wild exchange.
-      </doc>
-
-      <!-- Rule test name: was "amq_queue_25" -->
-      <rule name = "duplicates">
-        <doc>
-          A server MUST allow ignore duplicate bindings - that is, two or more bind
-          methods for a specific queue, with identical arguments - without treating these
-          as an error.
-        </doc>
-        <doc type = "scenario">
-          A client binds a named queue to an exchange. The client then repeats the bind
-          (with identical arguments).
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_39" -->
-      <rule name = "failure" on-failure = "??????">
-        <!--
-        TODO: Find correct code. The on-failure code returned should depend on why the bind
-        failed. Assuming that failures owing to bad parameters are covered in the rules relating
-        to those parameters, the only remaining reason for a failure would be the lack of
-        server resorces or some internal error - such as too many queues open. Would these
-        cases qualify as "resource error" 506 or "internal error" 541?
-        -->
-        <doc>If a bind fails, the server MUST raise a connection exception.</doc>
-        <doc type = "scenario">
-          TODO
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_12" -->
-      <rule name = "transient-exchange" on-failure = "not-allowed">
-        <doc>
-          The server MUST NOT allow a durable queue to bind to a transient exchange.
-        </doc>
-        <doc type = "scenario">
-          A client creates a transient exchange. The client then declares a named durable
-          queue and then attempts to bind the transient exchange to the durable queue.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_13" -->
-      <rule name = "durable-exchange">
-        <doc>
-          Bindings for durable queues are automatically durable and the server SHOULD
-          restore such bindings after a server restart.
-        </doc>
-        <doc type = "scenario">
-          A server creates a named durable queue and binds it to a durable exchange. The
-          server is restarted. The client then attempts to use the queue/exchange combination.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_17" -->
-      <rule name = "internal-exchange">
-        <doc>
-          If the client attempts to bind to an exchange that was declared as internal, the server
-          MUST raise a connection exception with reply code 530 (not allowed).
-        </doc>
-        <doc type = "scenario">
-          A client attempts to bind a named queue to an internal exchange.
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_queue_40" -->
-      <rule name = "binding-count">
-        <doc>
-          The server SHOULD support at least 4 bindings per queue, and ideally, impose no
-          limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          A client creates a named queue and attempts to bind it to 4 different non-internal
-          exchanges.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-
-      <response name = "bind-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          The client provides a valid access ticket giving "active" access rights to the
-          queue's access realm.
-        </doc>
-      </field>
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to bind. If the queue name is empty, refers to
-          the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "empty-queue" on-failure = "not-allowed">
-          <doc>
-            A client MUST NOT be allowed to bind a non-existent and unnamed queue (i.e.
-            empty queue name) to an exchange.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to bind with an unnamed (empty) queue name to an exchange.
-          </doc>
-        </rule>
-        
-        <!-- Rule test name: was "amq_queue_26" -->    
-        <rule name = "queue-existence" on-failure = "not-found">
-          <doc>
-            A client MUST NOT be allowed to bind a non-existent queue (i.e. not previously
-            declared) to an exchange.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to bind an undeclared queue name to an exchange.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "exchange" domain = "exchange-name" label = "name of the exchange to bind to">
-        <!-- Rule test name: was "amq_queue_14" -->    
-        <rule name = "exchange-existence" on-failure = "not-found">
-          <doc>
-            A client MUST NOT be allowed to bind a queue to a non-existent exchange.
-          </doc>
-          <doc type = "scenario">
-            A client attempts to bind an named queue to a undeclared exchange.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "routing-key" domain = "shortstr" label = "message routing key">
-        <doc>
-          Specifies the routing key for the binding. The routing key is used for routing
-          messages depending on the exchange configuration. Not all exchanges use a
-          routing key - refer to the specific exchange documentation.  If the queue name
-          is empty, the server uses the last queue declared on the channel.  If the
-          routing key is also empty, the server uses this queue name for the routing
-          key as well.  If the queue name is provided but the routing key is empty, the
-          server does the binding with that empty routing key.  The meaning of empty
-          routing keys depends on the exchange implementation.
-        </doc>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-      
-      <field name = "arguments" domain = "table" label = "arguments for binding">
-        <doc>
-          A set of arguments for the binding. The syntax and semantics of these arguments
-          depends on the exchange class.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "bind-ok" synchronous = "1" index = "21" label = "confirm bind successful">
-      <doc>This method confirms that the bind was successful.</doc>
-      
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "purge" synchronous = "1" index = "30" label = "purge a queue">
-      <doc>
-        This method removes all messages from a queue. It does not cancel consumers. Purged
-        messages are deleted without any formal "undo" mechanism.
-      </doc>
-      
-      <!-- Rule test name: was "amq_queue_15" -->    
-      <rule name = "01">
-        <doc>A call to purge MUST result in an empty queue.</doc>
-      </rule>
-      
-      <!-- Rule test name: was "amq_queue_41" -->
-      <rule name = "02">
-        <doc>
-          On transacted channels the server MUST not purge messages that have already been
-          sent to a client but not yet acknowledged.
-        </doc>
-      </rule>
-      
-      <!-- TODO: Rule split? -->
-      
-      <!-- Rule test name: was "amq_queue_42" -->    
-      <rule name = "03">
-        <doc>
-          The server MAY implement a purge queue or log that allows system administrators
-          to recover accidentally-purged messages. The server SHOULD NOT keep purged
-          messages in the same storage spaces as the live messages since the volumes of
-          purged messages may get very large.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "purge-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <doc>The access ticket must be for the access realm that holds the queue.</doc>
-        
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the queue's access realm. Note that purging a queue is equivalent to reading
-            all messages and discarding them.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to purge. If the queue name is empty, refers to
-          the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-        
-        <!-- TODO Rule split? -->
-        
-        <!-- Rule test name: was "amq_queue_16" -->    
-        <rule name = "02">
-          <doc>
-            The queue MUST exist. Attempting to purge a non-existing queue MUST cause a
-            channel exception.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "purge-ok" synchronous = "1" index = "31" label = "confirms a queue purge">
-      <doc>This method confirms the purge of a queue.</doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "message-count" domain = "long" label = "number of messages purged">
-        <doc>Reports the number of messages purged.</doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "delete" synchronous = "1" index = "40" label = "delete a queue">
-      <doc>
-        This method deletes a queue. When a queue is deleted any pending messages are sent
-        to a dead-letter queue if this is defined in the server configuration, and all
-        consumers on the queue are cancelled.
-      </doc>
-
-      <!-- TODO: Rule split? -->
-
-      <!-- Rule test name: was "amq_queue_43" -->
-      <rule name = "01">
-        <doc>
-          The server SHOULD use a dead-letter queue to hold messages that were pending on
-          a deleted queue, and MAY provide facilities for a system administrator to move
-          these messages back to an active queue.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <response name = "delete-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <doc>
-          The client provides a valid access ticket giving "active" access rights to the
-          queue's access realm.
-        </doc>
-      </field>
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to delete. If the queue name is empty, refers to
-          the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_queue_21" -->
-        <rule name = "02">
-          <doc>
-            The queue must exist. If the client attempts to delete a non-existing queue
-            the server MUST raise a channel exception with reply code 404 (not found).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "if-unused" domain = "bit" label = "delete only if unused">
-        <doc>
-          If set, the server will only delete the queue if it has no consumers. If the
-          queue has consumers the server does does not delete it but raises a channel
-          exception instead.
-        </doc>
-
-        <!-- Rule test name: was "amq_queue_29" and "amq_queue_30" -->
-        <rule name = "01">
-          <doc>The server MUST respect the if-unused flag when deleting a queue.</doc>
-        </rule>
-      </field>
-
-      <field name = "if-empty" domain = "bit" label = "delete only if empty">
-        <doc>
-          If set, the server will only delete the queue if it has no messages.
-        </doc>
-        <rule name = "01">
-          <doc>
-          If the queue is not empty the server MUST raise a channel exception with
-          reply code 406 (precondition failed).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "delete-ok" synchronous = "1" index = "41" label = "confirm deletion of a queue">
-      <doc>This method confirms the deletion of a queue.</doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "message-count" domain = "long" label = "number of messages purged">
-        <doc>Reports the number of messages purged.</doc>
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  BASIC  ============================================================ -->
-
-  <class name = "basic" handler = "channel" index = "60" label = "work with basic content">
-    <doc>
-      The Basic class provides methods that support an industry-standard messaging model.
-    </doc>
-
-    <doc type = "grammar">
-      basic               = C:QOS S:QOS-OK
-                          / C:CONSUME S:CONSUME-OK
-                          / C:CANCEL S:CANCEL-OK
-                          / C:PUBLISH content
-                          / S:RETURN content
-                          / S:DELIVER content
-                          / C:GET ( S:GET-OK content / S:GET-EMPTY )
-                          / C:ACK
-                          / C:REJECT
-    </doc>
-
-    <chassis name = "server" implement = "MUST" />
-    <chassis name = "client" implement = "MAY" />
-
-    <!-- Rule test name: was "amq_basic_08" -->
-    <rule name = "01">
-      <doc>
-        The server SHOULD respect the persistent property of basic messages and
-        SHOULD make a best-effort to hold persistent basic messages on a reliable
-        storage mechanism.
-      </doc>
-      <doc type = "scenario">
-        Send a persistent message to queue, stop server, restart server and then
-        verify whether message is still present.  Assumes that queues are durable.
-        Persistence without durable queues makes no sense.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_09" -->
-    <rule name = "02">
-      <doc>
-        The server MUST NOT discard a persistent basic message in case of a queue
-        overflow.
-      </doc>
-      <doc type = "scenario">
-        Create a queue overflow situation with persistent messages and verify that
-        messages do not get lost (presumably the server will write them to disk).
-      </doc>
-    </rule>
-
-    <rule name = "03">
-      <doc>
-        The server MAY use the Channel.Flow method to slow or stop a basic message
-        publisher when necessary.
-      </doc>
-      <doc type = "scenario">
-        Create a queue overflow situation with non-persistent messages and verify
-        whether the server responds with Channel.Flow or not. Repeat with persistent
-        messages.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_10" -->
-    <rule name = "04">
-      <doc>
-        The server MAY overflow non-persistent basic messages to persistent
-        storage.
-      </doc>
-      <!-- Test scenario: untestable -->
-    </rule>
-
-    <rule name = "05">
-      <doc>
-        The server MAY discard or dead-letter non-persistent basic messages on a
-        priority basis if the queue size exceeds some configured limit.
-      </doc>
-      <!-- Test scenario: untestable -->
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_11" -->
-    <rule name = "06">
-      <doc>
-        The server MUST implement at least 2 priority levels for basic messages,
-        where priorities 0-4 and 5-9 are treated as two distinct levels.
-      </doc>
-      <doc type = "scenario">
-        Send a number of priority 0 messages to a queue. Send one priority 9
-        message.  Consume messages from the queue and verify that the first message
-        received was priority 9.
-      </doc>
-    </rule>
-
-    <rule name = "07">
-      <doc>
-        The server MAY implement up to 10 priority levels.
-      </doc>
-      <doc type = "scenario">
-        Send a number of messages with mixed priorities to a queue, so that all
-        priority values from 0 to 9 are exercised. A good scenario would be ten
-        messages in low-to-high priority.  Consume from queue and verify how many
-        priority levels emerge.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_12" -->
-    <rule name = "08">
-      <doc>
-        The server MUST deliver messages of the same priority in order irrespective of
-        their individual persistence.
-      </doc>
-      <doc type = "scenario">
-        Send a set of messages with the same priority but different persistence
-        settings to a queue.  Consume and verify that messages arrive in same order
-        as originally published.
-      </doc>
-    </rule>
-
-    <!-- Rule test name: was "amq_basic_13" -->
-    <rule name = "09">
-      <doc>
-        The server MUST support automatic acknowledgements on Basic content, i.e.
-        consumers with the no-ack field set to FALSE.
-      </doc>
-      <doc type = "scenario">
-        Create a queue and a consumer using automatic acknowledgements.  Publish
-        a set of messages to the queue.  Consume the messages and verify that all
-        messages are received.
-      </doc>
-    </rule>
-
-    <rule name = "10">
-      <doc>
-        The server MUST support explicit acknowledgements on Basic content, i.e.
-        consumers with the no-ack field set to TRUE.
-      </doc>
-      <doc type = "scenario">
-        Create a queue and a consumer using explicit acknowledgements.  Publish a
-        set of messages to the queue.  Consume the messages but acknowledge only
-        half of them.  Disconnect and reconnect, and consume from the queue.
-        Verify that the remaining messages are received.
-      </doc>
-    </rule>
-
-    <!--  These are the properties for a Basic content  -->
-
-    <field name = "content-type"    domain = "shortstr"   label = "MIME content type" />
-    <field name = "content-encoding" domain = "shortstr"  label = "MIME content encoding" />
-    <field name = "headers"         domain = "table"      label = "message header field table" />
-    <field name = "delivery-mode"   domain = "octet"      label = "non-persistent (1) or persistent (2)" />
-    <field name = "priority"        domain = "octet"      label = "message priority, 0 to 9" />
-    <field name = "correlation-id"  domain = "shortstr"   label = "application correlation identifier" />
-    <field name = "reply-to"        domain = "shortstr"   label = "destination to reply to" />
-    <field name = "expiration"      domain = "shortstr"   label = "message expiration specification" />
-    <field name = "message-id"      domain = "shortstr"   label = "application message identifier" />
-    <field name = "timestamp"       domain = "timestamp"  label = "message timestamp" />
-    <field name = "type"            domain = "shortstr"   label = "message type name" />
-    <field name = "user-id"         domain = "shortstr"   label = "creating user id" />
-    <field name = "app-id"          domain = "shortstr"   label = "creating application id" />
-    <!-- This field is deprecated pending review -->
-    <field name = "cluster-id"      domain = "shortstr"   label = "intra-cluster routing identifier" />
-
-    <field name = "property-one"    domain = "shortstr"   label = "Extra property for testing only" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "qos" synchronous = "1" index = "10" label = "specify quality of service">
-      <doc>
-        This method requests a specific quality of service. The QoS can be specified for the
-        current channel or for all channels on the connection. The particular properties and
-        semantics of a qos method always depend on the content class semantics. Though the
-        qos method could in principle apply to both peers, it is currently meaningful only
-        for the server.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "qos-ok" />
-
-      <field name = "prefetch-size" domain = "long" label = "prefetch window in octets">
-        <doc>
-          The client can request that messages be sent in advance so that when the client
-          finishes processing a message, the following message is already held locally,
-          rather than needing to be sent down the channel. Prefetching gives a performance
-          improvement. This field specifies the prefetch window size in octets. The server
-          will send a message in advance if it is equal to or smaller in size than the
-          available prefetch size (and also falls into other prefetch limits). May be set
-          to zero, meaning "no specific limit", although other prefetch limits may still
-          apply. The prefetch-size is ignored if the no-ack option is set.
-        </doc>
-        <!-- Rule test name: was "amq_basic_17" -->
-        <rule name = "01">
-          <doc>
-            The server MUST ignore this setting when the client is not processing any
-            messages - i.e. the prefetch size does not limit the transfer of single
-            messages to a client, only the sending in advance of more messages while
-            the client still has one or more unacknowledged messages.
-          </doc>
-          <doc type = "scenario">
-            Define a QoS prefetch-size limit and send a single message that exceeds
-            that limit.  Verify that the message arrives correctly.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "prefetch-count" domain = "short" label = "prefetch window in messages">
-        <doc>
-          Specifies a prefetch window in terms of whole messages. This field may be used
-          in combination with the prefetch-size field; a message will only be sent in
-          advance if both prefetch windows (and those at the channel and connection level)
-          allow it. The prefetch-count is ignored if the no-ack option is set.
-        </doc>
-        <!-- Rule test name: was "amq_basic_18" -->
-        <rule name = "01">
-          <doc>
-            The server may send less data in advance than allowed by the client's
-            specified prefetch windows but it MUST NOT send more.
-          </doc>
-          <doc type = "scenario">
-            Define a QoS prefetch-size limit and a prefetch-count limit greater than
-            one.  Send multiple messages that exceed the prefetch size.  Verify that
-            no more than one message arrives at once.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "global" domain = "bit" label = "apply to entire connection">
-        <doc>
-          By default the QoS settings apply to the current channel only. If this field is
-          set, they are applied to the entire connection.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "qos-ok" synchronous = "1" index = "11" label = "confirm the requested qos">
-      <doc>
-        This method tells the client that the requested QoS levels could be handled by the
-        server. The requested QoS applies to all active consumers until a new QoS is
-        defined.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "consume" synchronous = "1" index = "30" label = "start a queue consumer">
-      <doc>
-        This method asks the server to start a "consumer", which is a transient request for
-        messages from a specific queue. Consumers last as long as the channel they were
-        created on, or until the client cancels them.
-      </doc>
-
-      <!-- Rule test name: was "amq_basic_01" -->
-      <rule name = "01">
-        <doc>
-          The server SHOULD support at least 16 consumers per queue, and ideally, impose
-          no limit except as defined by available resources.
-        </doc>
-        <doc type = "scenario">
-          Create a queue and create consumers on that queue until the server closes the
-          connection. Verify that the number of consumers created was at least sixteen
-          and report the total number.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "consume-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01" on-failure = "access-refused">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create a consumer with an invalid (non-zero) access ticket.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-        <rule name = "01" on-failure = "not-allowed">
-          <doc>
-            If the queue name is empty the client MUST have previously declared a
-            queue using this channel.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create a consumer with an empty queue name and no previously
-            declared queue on the channel.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Specifies the identifier for the consumer. The consumer tag is local to a
-          connection, so two clients can use the same consumer tags. If this field is
-          empty the server will generate a unique tag.
-        </doc>
-        <rule name = "01" on-failure = "not-allowed">
-          <doc>
-            The client MUST NOT specify a tag that refers to an existing consumer.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create two consumers with the same non-empty tag.
-          </doc>
-        </rule>
-        <rule name = "02" on-failure = "not-allowed">
-          <doc>
-            The consumer tag is valid only within the channel from which the
-            consumer was created. I.e. a client MUST NOT create a consumer in one
-            channel and then use it in another.
-          </doc>
-          <doc type = "scenario">
-            Attempt to create a consumer in one channel, then use in another channel,
-            in which consumers have also been created (to test that the server uses
-            unique consumer tags).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "no-local" domain = "no-local" />
-
-      <field name = "no-ack" domain = "no-ack" />
-
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive consumer access, meaning only this consumer can access the
-          queue.
-        </doc>
-        <!-- Rule test name: was "amq_basic_02" -->
-        <rule name = "01" on-failure = "access-refused">
-          <doc>
-            The client MAY NOT gain exclusive access to a queue that already has
-            active consumers.
-          </doc>
-          <doc type = "scenario">
-            Open two connections to a server, and in one connection create a shared
-            (non-exclusive) queue and then consume from the queue.  In the second
-            connection attempt to consume from the same queue using the exclusive
-            option.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise
-          a channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "consume-ok" synchronous = "1" index = "31" label = "confirm a new consumer">
-      <doc>
-        The server provides the client with a consumer tag, which is used by the client
-        for methods called on the consumer at a later stage.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Holds the consumer tag specified by the client or provided by the server.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "cancel" synchronous = "1" index = "20" label = "end a queue consumer">
-      <doc>
-        This method cancels a consumer. This does not affect already delivered
-        messages, but it does mean the server will not send any more messages for
-        that consumer. The client may receive an abitrary number of messages in
-        between sending the cancel method and receiving the cancel-ok reply.
-      </doc>
-
-      <rule name = "01">
-        <doc>
-          If the queue does not exist the server MUST ignore the cancel method, so
-          long as the consumer tag is valid for that channel.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "cancel-ok" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "cancel-ok" synchronous = "1" index = "21" label = "confirm a cancelled consumer">
-      <doc>
-        This method confirms that the cancellation was completed.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "publish" content = "1" index = "40" label = "publish a message">
-      <doc>
-        This method publishes a message to a specific exchange. The message will be routed
-        to queues as defined by the exchange configuration and distributed to any active
-        consumers when the transaction, if any, is committed.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "write" access rights
-            to the access realm for the exchange.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange to publish to. The exchange name can be
-          empty, meaning the default exchange. If the exchange name is specified, and that
-          exchange does not exist, the server will raise a channel exception.
-        </doc>
-
-        <!-- Rule test name: was "amq_basic_06" -->
-        <rule name = "01">
-          <doc>
-            The server MUST accept a blank exchange name to mean the default exchange.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_basic_14" -->
-        <rule name = "02">
-          <doc>
-            If the exchange was declared as an internal exchange, the server MUST raise
-            a channel exception with a reply code 403 (access refused).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-
-        <!-- Rule test name: was "amq_basic_15" -->
-        <rule name = "03">
-          <doc>
-            The exchange MAY refuse basic content in which case it MUST raise a channel
-            exception with reply code 540 (not implemented).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key for the message. The routing key is used for routing
-          messages depending on the exchange configuration.
-        </doc>
-      </field>
-
-      <field name = "mandatory" domain = "bit" label = "indicate mandatory routing">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue. If this flag is set, the server will return an unroutable message with a
-          Return method. If this flag is zero, the server silently drops the message.
-        </doc>
-        <!-- Rule test name: was "amq_basic_07" -->
-        <rule name = "01">
-          <doc>
-            The server SHOULD implement the mandatory flag.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "immediate" domain = "bit" label = "request immediate delivery">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue consumer immediately. If this flag is set, the server will return an
-          undeliverable message with a Return method. If this flag is zero, the server
-          will queue the message, but with no guarantee that it will ever be consumed.
-        </doc>
-        <!-- Rule test name: was "amq_basic_16" -->
-        <rule name = "01">
-          <doc>
-            The server SHOULD implement the immediate flag.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "return" content = "1" index = "50" label = "return a failed message">
-      <doc>
-        This method returns an undeliverable message that was published with the "immediate"
-        flag set, or an unroutable message published with the "mandatory" flag set. The
-        reply code and text provide information about the reason that the message was
-        undeliverable.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "reply-code" domain = "reply-code" />
-
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key name specified when the message was published.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "deliver" content = "1" index = "60"
-      label = "notify the client of a consumer message">
-      <doc>
-        This method delivers a message to the client, via a consumer. In the asynchronous
-        message delivery model, the client starts a consumer using the Consume method, then
-        the server responds with Deliver methods as and when messages arrive for that
-        consumer.
-      </doc>
-
-      <!-- Rule test name: was "amq_basic_19" -->
-      <rule name = "01">
-        <!-- TODO: Rule split? -->
-        <doc>
-          The server SHOULD track the number of times a message has been delivered to
-          clients and when a message is redelivered a certain number of times - e.g. 5
-          times - without being acknowledged, the server SHOULD consider the message to be
-          unprocessable (possibly causing client applications to abort), and move the
-          message to a dead letter queue.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "redelivered" domain = "redelivered" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "get" synchronous = "1" index = "70" label = "direct access to a queue">
-      <doc>
-        This method provides a direct access to the messages in a queue using a synchronous
-        dialogue that is designed for specific types of application where synchronous
-        functionality is more important than performance.
-      </doc>
-
-      <response name = "get-ok" />
-      <response name = "get-empty" />
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "no-ack" domain = "no-ack" />
-    </method>
-
-    <method name = "get-ok" synchronous = "1" content = "1" index = "71"
-      label = "provide client with a message">
-      <doc>
-        This method delivers a message to the client following a get method. A message
-        delivered by 'get-ok' must be acknowledged unless the no-ack option was set in the
-        get method.
-      </doc>
-
-      <chassis name = "client" implement = "MAY" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "redelivered" domain = "redelivered" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-          If empty, the message was published to the default exchange.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-
-      <field name = "message-count" domain = "long" label = "number of messages pending">
-        <doc>
-          This field reports the number of messages pending on the queue, excluding the
-          message being delivered. Note that this figure is indicative, not reliable, and
-          can change arbitrarily as messages are added to the queue and removed by other
-          clients.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "get-empty" synchronous = "1" index = "72"
-      label = "indicate no messages available">
-      <doc>
-        This method tells the client that the queue has no messages available for the
-        client.
-      </doc>
-
-      <chassis name = "client" implement = "MAY" />
-
-      <!-- This field is deprecated pending review -->
-      <field name = "cluster-id" domain = "shortstr" label = "Cluster id">
-        <doc>
-          For use by cluster applications, should not be used by client applications.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "ack" index = "80" label = "acknowledge one or more messages">
-      <doc>
-        This method acknowledges one or more messages delivered via the Deliver or Get-Ok
-        methods. The client can ask to confirm a single message or a set of messages up to
-        and including a specific message.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "multiple" domain = "bit" label = "acknowledge multiple messages">
-        <doc>
-          If set to 1, the delivery tag is treated as "up to and including", so that the
-          client can acknowledge multiple messages with a single method. If set to zero,
-          the delivery tag refers to a single message. If the multiple field is 1, and the
-          delivery tag is zero, tells the server to acknowledge all outstanding mesages.
-        </doc>
-
-        <!-- Rule test name: was "amq_basic_20" -->
-        <rule name = "01">
-          <doc>
-            The server MUST validate that a non-zero delivery-tag refers to an delivered
-            message, and raise a channel exception if this is not the case.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "reject" index = "90" label = "reject an incoming message">
-      <doc>
-        This method allows a client to reject a message. It can be used to interrupt and
-        cancel large incoming messages, or return untreatable messages to their original
-        queue.
-      </doc>
-
-      <!-- Rule test name: was "amq_basic_21" -->
-      <rule name = "01">
-        <doc>
-          The server SHOULD be capable of accepting and process the Reject method while
-          sending message content with a Deliver or Get-Ok method. I.e. the server should
-          read and process incoming methods while sending output frames. To cancel a
-          partially-send content, the server sends a content body frame of size 1 (i.e.
-          with no data except the frame-end octet).
-        </doc>
-      </rule>
-
-      <!-- Rule test name: was "amq_basic_22" -->
-      <rule name = "02">
-        <doc>
-          The server SHOULD interpret this method as meaning that the client is unable to
-          process the message at this time.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <rule name = "03">
-        <!-- TODO: Rule split? -->
-        <doc>
-          A client MUST NOT use this method as a means of selecting messages to process. A
-          rejected message MAY be discarded or dead-lettered, not necessarily passed to
-          another client.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "requeue" domain = "bit" label = "requeue the message">
-        <doc>
-          If this field is zero, the message will be discarded. If this bit is 1, the
-          server will attempt to requeue the message.
-        </doc>
-
-        <!-- Rule test name: was "amq_basic_23" -->
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MUST NOT deliver the message to the same client within the
-            context of the current channel. The recommended strategy is to attempt to
-            deliver the message to an alternative consumer, and if that is not possible,
-            to move the message to a dead-letter queue. The server MAY use more
-            sophisticated tracking to hold the message on the queue and redeliver it to
-            the same client at a later stage.
-          </doc>
-          <doc type = "scenario">
-            TODO.
-          </doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "recover" index = "100" label = "redeliver unacknowledged messages">
-      <doc>
-        This method asks the broker to redeliver all unacknowledged messages on a specified
-        channel. Zero or more messages may be redelivered. This method is only allowed on
-        non-transacted channels.
-      </doc>
-
-      <rule name = "01">
-        <doc>
-          The server MUST set the redelivered flag on all messages that are resent.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <rule name = "02">
-        <doc>
-          The server MUST raise a channel exception if this is called on a transacted
-          channel.
-        </doc>
-        <doc type = "scenario">
-          TODO.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "requeue" domain = "bit" label = "requeue the message">
-        <doc>
-          If this field is zero, the message will be redelivered to the original
-          recipient. If this bit is 1, the server will attempt to requeue the message,
-          potentially then delivering it to an alternative subscriber.
-        </doc>
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  FILE  ============================================================= -->
-
-  <class name = "file" handler = "channel" index = "70" label = "work with file content">
-    <doc>
-      The file class provides methods that support reliable file transfer. File
-      messages have a specific set of properties that are required for interoperability
-      with file transfer applications. File messages and acknowledgements are subject to
-      channel transactions. Note that the file class does not provide message browsing
-      methods; these are not compatible with the staging model. Applications that need
-      browsable file transfer should use Basic content and the Basic class.
-    </doc>
-
-    <doc type = "grammar">
-      file                = C:QOS S:QOS-OK
-                          / C:CONSUME S:CONSUME-OK
-                          / C:CANCEL S:CANCEL-OK
-                          / C:OPEN S:OPEN-OK C:STAGE content
-                          / S:OPEN C:OPEN-OK S:STAGE content
-                          / C:PUBLISH
-                          / S:DELIVER
-                          / S:RETURN
-                          / C:ACK
-                          / C:REJECT
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <rule name = "01">
-      <doc>
-        The server MUST make a best-effort to hold file messages on a reliable storage
-        mechanism.
-      </doc>
-    </rule>
-
-    <!-- TODO Rule implement attr inverse? -->
-
-    <!-- TODO: Rule split? -->
-
-    <rule name = "02">
-      <doc>
-        The server MUST NOT discard a file message in case of a queue overflow. The server
-        MUST use the Channel.Flow method to slow or stop a file message publisher when
-        necessary.
-      </doc>
-    </rule>
-
-    <!-- TODO: Rule split? -->
-
-    <rule name = "03">
-      <doc>
-        The server MUST implement at least 2 priority levels for file messages, where
-        priorities 0-4 and 5-9 are treated as two distinct levels. The server MAY implement
-        up to 10 priority levels.
-      </doc>
-    </rule>
-    
-    <rule name = "04">
-      <doc>
-        The server MUST support both automatic and explicit acknowledgements on file
-        content.
-      </doc>
-    </rule>
-    
-    <!--  These are the properties for a File content  -->
-
-    <field name = "content-type"    domain = "shortstr"   label = "MIME content type" />
-    <field name = "content-encoding" domain = "shortstr"  label = "MIME content encoding" />
-    <field name = "headers"         domain = "table"      label = "message header field table" />
-    <field name = "priority"        domain = "octet"      label = "message priority, 0 to 9" />
-    <field name = "reply-to"        domain = "shortstr"   label = "destination to reply to" />
-    <field name = "message-id"      domain = "shortstr"   label = "application message identifier" />
-    <field name = "filename"        domain = "shortstr"   label = "message filename" />
-    <field name = "timestamp"       domain = "timestamp"  label = "message timestamp" />
-    <!-- This field is deprecated pending review -->
-    <field name = "cluster-id"      domain = "shortstr"   label = "intra-cluster routing identifier" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "qos" synchronous = "1" index = "10" label = "specify quality of service">
-      <doc>
-        This method requests a specific quality of service. The QoS can be specified for the
-        current channel or for all channels on the connection. The particular properties and
-        semantics of a qos method always depend on the content class semantics. Though the
-        qos method could in principle apply to both peers, it is currently meaningful only
-        for the server.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "qos-ok" />
-      
-      <field name = "prefetch-size" domain = "long" label = "prefetch window in octets">
-        <doc>
-          The client can request that messages be sent in advance so that when the client
-          finishes processing a message, the following message is already held locally,
-          rather than needing to be sent down the channel. Prefetching gives a performance
-          improvement. This field specifies the prefetch window size in octets. May be set
-          to zero, meaning "no specific limit". Note that other prefetch limits may still
-          apply. The prefetch-size is ignored if the no-ack option is set.
-        </doc>
-      </field>
-      
-      <field name = "prefetch-count" domain = "short" label = "prefetch window in messages">
-        <doc>
-          Specifies a prefetch window in terms of whole messages. This is compatible with
-          some file API implementations. This field may be used in combination with the
-          prefetch-size field; a message will only be sent in advance if both prefetch
-          windows (and those at the channel and connection level) allow it. The
-          prefetch-count is ignored if the no-ack option is set.
-        </doc>
-        
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MAY send less data in advance than allowed by the client's
-            specified prefetch windows but it MUST NOT send more.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "global" domain = "bit" label = "apply to entire connection">
-        <doc>
-          By default the QoS settings apply to the current channel only. If this field is
-          set, they are applied to the entire connection.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "qos-ok" synchronous = "1" index = "11" label = "confirm the requested qos">
-      <doc>
-        This method tells the client that the requested QoS levels could be handled by the
-        server. The requested QoS applies to all active consumers until a new QoS is
-        defined.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "consume" synchronous = "1" index = "20" label = "start a queue consumer">
-      <doc>
-        This method asks the server to start a "consumer", which is a transient request for
-        messages from a specific queue. Consumers last as long as the channel they were
-        created on, or until the client cancels them.
-      </doc>
-      
-      <rule name = "01">
-        <doc>
-          The server SHOULD support at least 16 consumers per queue, unless the queue was
-          declared as private, and ideally, impose no limit except as defined by available
-          resources.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "consume-ok" />
-      
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Specifies the identifier for the consumer. The consumer tag is local to a
-          connection, so two clients can use the same consumer tags. If this field is
-          empty the server will generate a unique tag.
-        </doc>
-        
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The tag MUST NOT refer to an existing consumer. If the client attempts to
-            create two consumers with the same non-empty tag the server MUST raise a
-            connection exception with reply code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "no-local" domain = "no-local" />
-      
-      <field name = "no-ack" domain = "no-ack" />
-      
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive consumer access, meaning only this consumer can access the
-          queue.
-        </doc>
-
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>
-            If the server cannot grant exclusive access to the queue when asked, -
-            because there are other consumers active - it MUST raise a channel exception
-            with return code 405 (resource locked).
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "consume-ok" synchronous = "1" index = "21" label = "confirm a new consumer">
-      <doc>
-        This method provides the client with a consumer tag which it MUST use in methods
-        that work with the consumer.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>Holds the consumer tag specified by the client or provided by the server.</doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "cancel" synchronous = "1" index = "30" label = "end a queue consumer">
-      <doc>
-        This method cancels a consumer. This does not affect already delivered messages, but
-        it does mean the server will not send any more messages for that consumer.
-      </doc>
-
-      <response name = "cancel-ok" />
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "cancel-ok" synchronous = "1" index = "31" label = "confirm a cancelled consumer">
-      <doc>This method confirms that the cancellation was completed.</doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "open" synchronous = "1" index = "40" label = "request to start staging">
-      <doc>
-        This method requests permission to start staging a message. Staging means sending
-        the message into a temporary area at the recipient end and then delivering the
-        message by referring to this temporary area. Staging is how the protocol handles
-        partial file transfers - if a message is partially staged and the connection breaks,
-        the next time the sender starts to stage it, it can restart from where it left off.
-      </doc>
-
-      <response name = "open-ok" />
-
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "identifier" domain = "shortstr" label = "staging identifier">
-        <doc>
-          This is the staging identifier. This is an arbitrary string chosen by the
-          sender. For staging to work correctly the sender must use the same staging
-          identifier when staging the same message a second time after recovery from a
-          failure. A good choice for the staging identifier would be the SHA1 hash of the
-          message properties data (including the original filename, revised time, etc.).
-        </doc>
-      </field>
-      
-      <field name = "content-size" domain = "longlong" label = "message content size">
-        <doc>
-          The size of the content in octets. The recipient may use this information to
-          allocate or check available space in advance, to avoid "disk full" errors during
-          staging of very large messages.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The sender MUST accurately fill the content-size field. Zero-length content
-            is permitted.
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <method name = "open-ok" synchronous = "1" index = "41" label = "confirm staging ready">
-      <doc>
-        This method confirms that the recipient is ready to accept staged data. If the
-        message was already partially-staged at a previous time the recipient will report
-        the number of octets already staged.
-      </doc>
-      
-      <response name = "stage" />
-      
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "staged-size" domain = "longlong" label = "already staged amount">
-        <doc>
-          The amount of previously-staged content in octets. For a new message this will
-          be zero.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The sender MUST start sending data from this octet offset in the message,
-            counting from zero.
-          </doc>
-        </rule>
-        
-        <rule name = "02">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The recipient MAY decide how long to hold partially-staged content and MAY
-            implement staging by always discarding partially-staged content. However if
-            it uses the file content type it MUST support the staging methods.
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "stage" content = "1" index = "50" label = "stage message content">
-      <doc>
-        This method stages the message, sending the message content to the recipient from
-        the octet offset specified in the Open-Ok method.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "publish" index = "60" label = "publish a message">
-      <doc>
-        This method publishes a staged file message to a specific exchange. The file message
-        will be routed to queues as defined by the exchange configuration and distributed to
-        any active consumers when the transaction, if any, is committed.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "write" access rights
-            to the access realm for the exchange.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange to publish to. The exchange name can be
-          empty, meaning the default exchange. If the exchange name is specified, and that
-          exchange does not exist, the server will raise a channel exception.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The server MUST accept a blank exchange name to mean the default exchange.
-          </doc>
-        </rule>
-        
-        <rule name = "02">
-          <doc>
-            If the exchange was declared as an internal exchange, the server MUST
-            respond with a reply code 403 (access refused) and raise a channel
-            exception.
-          </doc>
-        </rule>
-        
-        <!-- TODO: Rule split? -->
-        
-        <rule name = "03">
-          <doc>
-            The exchange MAY refuse file content in which case it MUST respond with a
-            reply code 540 (not implemented) and raise a channel exception.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key for the message. The routing key is used for routing
-          messages depending on the exchange configuration.
-        </doc>
-      </field>
-      
-      <field name = "mandatory" domain = "bit" label = "indicate mandatory routing">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue. If this flag is set, the server will return an unroutable message with a
-          Return method. If this flag is zero, the server silently drops the message.
-        </doc>
-        
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the mandatory flag.</doc>
-        </rule>
-      </field>
-      
-      <field name = "immediate" domain = "bit" label = "request immediate delivery">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue consumer immediately. If this flag is set, the server will return an
-          undeliverable message with a Return method. If this flag is zero, the server
-          will queue the message, but with no guarantee that it will ever be consumed.
-        </doc>
-                
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the immediate flag.</doc>
-        </rule>
-      </field>
-      
-      <field name = "identifier" domain = "shortstr" label = "staging identifier">
-        <doc>
-          This is the staging identifier of the message to publish. The message must have
-          been staged. Note that a client can send the Publish method asynchronously
-          without waiting for staging to finish.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "return" content = "1" index = "70" label = "return a failed message">
-      <doc>
-        This method returns an undeliverable message that was published with the "immediate"
-        flag set, or an unroutable message published with the "mandatory" flag set. The
-        reply code and text provide information about the reason that the message was
-        undeliverable.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "reply-code" domain = "reply-code" />
-      
-      <field name = "reply-text" domain = "reply-text" />
-      
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "deliver" index = "80" label = "notify the client of a consumer message">
-      <doc>
-        This method delivers a staged file message to the client, via a consumer. In the
-        asynchronous message delivery model, the client starts a consumer using the Consume
-        method, then the server responds with Deliver methods as and when messages arrive
-        for that consumer.
-      </doc>
-      
-      <rule name = "01">
-        <!-- TODO: Rule split? -->
-        <doc>
-          The server SHOULD track the number of times a message has been delivered to
-          clients and when a message is redelivered a certain number of times - e.g. 5
-          times - without being acknowledged, the server SHOULD consider the message to be
-          unprocessable (possibly causing client applications to abort), and move the
-          message to a dead letter queue.
-        </doc>
-      </rule>
-      
-      <chassis name = "client" implement = "MUST" />
-      
-      <field name = "consumer-tag" domain = "consumer-tag" />
-      
-      <field name = "delivery-tag" domain = "delivery-tag" />
-      
-      <field name = "redelivered" domain = "redelivered" />
-      
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-      
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-      
-      <field name = "identifier" domain = "shortstr" label = "staging identifier">
-        <doc>
-          This is the staging identifier of the message to deliver. The message must have
-          been staged. Note that a server can send the Deliver method asynchronously
-          without waiting for staging to finish.
-        </doc>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "ack" index = "90" label = "acknowledge one or more messages">
-      <doc>
-        This method acknowledges one or more messages delivered via the Deliver method. The
-        client can ask to confirm a single message or a set of messages up to and including
-        a specific message.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <field name = "delivery-tag" domain = "delivery-tag" />
-      
-      <field name = "multiple" domain = "bit" label = "acknowledge multiple messages">
-        <doc>
-          If set to 1, the delivery tag is treated as "up to and including", so that the
-          client can acknowledge multiple messages with a single method. If set to zero,
-          the delivery tag refers to a single message. If the multiple field is 1, and the
-          delivery tag is zero, tells the server to acknowledge all outstanding mesages.
-        </doc>
-        
-        <rule name = "01">
-          <doc>
-            The server MUST validate that a non-zero delivery-tag refers to an delivered
-            message, and raise a channel exception if this is not the case.
-          </doc>
-        </rule>
-      </field>
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "reject" index = "100" label = "reject an incoming message">
-      <doc>
-        This method allows a client to reject a message. It can be used to return
-        untreatable messages to their original queue. Note that file content is staged
-        before delivery, so the client will not use this method to interrupt delivery of a
-        large message.
-      </doc>
-      
-      <rule name = "01">
-        <doc>
-          The server SHOULD interpret this method as meaning that the client is unable to
-          process the message at this time.
-        </doc>
-      </rule>
-      
-      <!-- TODO: Rule split? -->
-      
-      <rule name = "02">
-        <doc>
-          A client MUST NOT use this method as a means of selecting messages to process. A
-          rejected message MAY be discarded or dead-lettered, not necessarily passed to
-          another client.
-        </doc>
-      </rule>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <field name = "delivery-tag" domain = "delivery-tag" />
-      
-      <field name = "requeue" domain = "bit" label = "requeue the message">
-        <doc>
-          If this field is zero, the message will be discarded. If this bit is 1, the
-          server will attempt to requeue the message.
-        </doc>
-        
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MUST NOT deliver the message to the same client within the
-            context of the current channel. The recommended strategy is to attempt to
-            deliver the message to an alternative consumer, and if that is not possible,
-            to move the message to a dead-letter queue. The server MAY use more
-            sophisticated tracking to hold the message on the queue and redeliver it to
-            the same client at a later stage.
-          </doc>
-        </rule>
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  STREAM  =========================================================== -->
-
-  <class name = "stream" handler = "channel" index = "80" label = "work with streaming content">
-    <doc>
-      The stream class provides methods that support multimedia streaming. The stream class
-      uses the following semantics: one message is one packet of data; delivery is
-      unacknowleged and unreliable; the consumer can specify quality of service parameters
-      that the server can try to adhere to; lower-priority messages may be discarded in favour
-      of high priority messages.
-    </doc>
-    
-    <doc type = "grammar">
-      stream              = C:QOS S:QOS-OK
-                          / C:CONSUME S:CONSUME-OK
-                          / C:CANCEL S:CANCEL-OK
-                          / C:PUBLISH content
-                          / S:RETURN
-                          / S:DELIVER content
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <rule name = "01">
-      <doc>
-        The server SHOULD discard stream messages on a priority basis if the queue size
-        exceeds some configured limit.
-      </doc>
-    </rule>
-    
-    <rule name = "02">
-      <!-- TODO: Rule split? -->
-      <doc>
-        The server MUST implement at least 2 priority levels for stream messages, where
-        priorities 0-4 and 5-9 are treated as two distinct levels. The server MAY implement
-        up to 10 priority levels.
-      </doc>
-    </rule>
-    
-    <rule name = "03">
-      <doc>
-        The server MUST implement automatic acknowledgements on stream content. That is, as
-        soon as a message is delivered to a client via a Deliver method, the server must
-        remove it from the queue.
-      </doc>
-    </rule>
-    
-    <!--  These are the properties for a Stream content  -->
-
-    <field name = "content-type"    domain = "shortstr"   label = "MIME content type" />
-    <field name = "content-encoding" domain = "shortstr"  label = "MIME content encoding" />
-    <field name = "headers"         domain = "table"      label = "message header field table" />
-    <field name = "priority"        domain = "octet"      label = "message priority, 0 to 9" />
-    <field name = "timestamp"       domain = "timestamp"  label = "message timestamp" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "qos" synchronous = "1" index = "10" label = "specify quality of service">
-      <doc>
-        This method requests a specific quality of service. The QoS can be specified for the
-        current channel or for all channels on the connection. The particular properties and
-        semantics of a qos method always depend on the content class semantics. Though the
-        qos method could in principle apply to both peers, it is currently meaningful only
-        for the server.
-      </doc>
-      
-      <chassis name = "server" implement = "MUST" />
-      
-      <response name = "qos-ok" />
-      
-      <field name = "prefetch-size" domain = "long" label = "prefetch window in octets">
-        <doc>
-          The client can request that messages be sent in advance so that when the client
-          finishes processing a message, the following message is already held locally,
-          rather than needing to be sent down the channel. Prefetching gives a performance
-          improvement. This field specifies the prefetch window size in octets. May be set
-          to zero, meaning "no specific limit". Note that other prefetch limits may still
-          apply.
-        </doc>
-      </field>
-      
-      <field name = "prefetch-count" domain = "short" label = "prefetch window in messages">
-        <doc>
-          Specifies a prefetch window in terms of whole messages. This field may be used
-          in combination with the prefetch-size field; a message will only be sent in
-          advance if both prefetch windows (and those at the channel and connection level)
-          allow it.
-        </doc>
-      </field>
-      
-      <field name = "consume-rate" domain = "long" label = "transfer rate in octets/second">
-        <doc>
-          Specifies a desired transfer rate in octets per second. This is usually
-          determined by the application that uses the streaming data. A value of zero
-          means "no limit", i.e. as rapidly as possible.
-        </doc>
-
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The server MAY ignore the prefetch values and consume rates, depending on
-            the type of stream and the ability of the server to queue and/or reply it.
-            The server MAY drop low-priority messages in favour of high-priority
-            messages.
-          </doc>
-        </rule>
-      </field>
-      
-      <field name = "global" domain = "bit" label = "apply to entire connection">
-        <doc>
-          By default the QoS settings apply to the current channel only. If this field is
-          set, they are applied to the entire connection.
-        </doc>
-      </field>
-    </method>
-    
-    <method name = "qos-ok" synchronous = "1" index = "11" label = "confirm the requested qos">
-      <doc>
-        This method tells the client that the requested QoS levels could be handled by the
-        server. The requested QoS applies to all active consumers until a new QoS is
-        defined.
-      </doc>
-      
-      <chassis name = "client" implement = "MUST" />
-    </method>
-    
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    
-    <method name = "consume" synchronous = "1" index = "20" label = "start a queue consumer">
-      <doc>
-        This method asks the server to start a "consumer", which is a transient request for
-        messages from a specific queue. Consumers last as long as the channel they were
-        created on, or until the client cancels them.
-      </doc>
-
-      <rule name = "01">
-        <doc>
-          The server SHOULD support at least 16 consumers per queue, unless the queue was
-          declared as private, and ideally, impose no limit except as defined by available
-          resources.
-        </doc>
-      </rule>
-
-      <rule name = "02">
-        <doc>
-          Streaming applications SHOULD use different channels to select different
-          streaming resolutions. AMQP makes no provision for filtering and/or transforming
-          streams except on the basis of priority-based selective delivery of individual
-          messages.
-        </doc>
-      </rule>
-
-      <chassis name = "server" implement = "MUST" />
-      <response name = "consume-ok" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "read" access rights to
-            the realm for the queue.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue to consume from. If the queue name is null,
-          refers to the current queue for the channel, which is the last declared queue.
-        </doc>
-
-        <rule name = "01">
-          <doc>
-            If the client did not previously declare a queue, and the queue name in this
-            method is empty, the server MUST raise a connection exception with reply
-            code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>
-          Specifies the identifier for the consumer. The consumer tag is local to a
-          connection, so two clients can use the same consumer tags. If this field is
-          empty the server will generate a unique tag.
-        </doc>
-
-        <rule name = "01">
-          <!-- TODO: Rule split? -->
-          <doc>
-            The tag MUST NOT refer to an existing consumer. If the client attempts to
-            create two consumers with the same non-empty tag the server MUST raise a
-            connection exception with reply code 530 (not allowed).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "no-local" domain = "no-local" />
-
-      <field name = "exclusive" domain = "bit" label = "request exclusive access">
-        <doc>
-          Request exclusive consumer access, meaning only this consumer can access the
-          queue.
-        </doc>
-
-
-        <!-- Rule test name: was "amq_file_00" -->    
-        <rule name = "01">
-          <doc>
-            If the server cannot grant exclusive access to the queue when asked, -
-            because there are other consumers active - it MUST raise a channel exception
-            with return code 405 (resource locked).
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "consume-ok" synchronous = "1" index = "21" label = "confirm a new consumer">
-      <doc>
-        This method provides the client with a consumer tag which it may use in methods that
-        work with the consumer.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag">
-        <doc>Holds the consumer tag specified by the client or provided by the server.</doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "cancel" synchronous = "1" index = "30" label = "end a queue consumer">
-      <doc>
-        This method cancels a consumer. Since message delivery is asynchronous the client
-        may continue to receive messages for a short while after canceling a consumer. It
-        may process or discard these as appropriate.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <response name = "cancel-ok" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "nowait" domain = "bit" label = "do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait
-          for a reply method. If the server could not complete the method it will raise a
-          channel or connection exception.
-        </doc>
-      </field>
-    </method>
-
-    <method name = "cancel-ok" synchronous = "1" index = "31" label = "confirm a cancelled consumer">
-      <doc>This method confirms that the cancellation was completed.</doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "publish" content = "1" index = "40" label = "publish a message">
-      <doc>
-        This method publishes a message to a specific exchange. The message will be routed
-        to queues as defined by the exchange configuration and distributed to any active
-        consumers as appropriate.
-      </doc>
-
-      <chassis name = "server" implement = "MUST" />
-
-      <field name = "ticket" domain = "access-ticket">
-        <rule name = "01">
-          <doc>
-            The client MUST provide a valid access ticket giving "write" access rights
-            to the access realm for the exchange.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange to publish to. The exchange name can be
-          empty, meaning the default exchange. If the exchange name is specified, and that
-          exchange does not exist, the server will raise a channel exception.
-        </doc>
-
-        <rule name = "01">
-          <doc>
-            The server MUST accept a blank exchange name to mean the default exchange.
-          </doc>
-        </rule>
-
-        <rule name = "02">
-          <doc>
-            If the exchange was declared as an internal exchange, the server MUST
-            respond with a reply code 403 (access refused) and raise a channel
-            exception.
-          </doc>
-        </rule>
-
-        <rule name = "03">
-          <doc>
-            The exchange MAY refuse stream content in which case it MUST respond with a
-            reply code 540 (not implemented) and raise a channel exception.
-          </doc>
-        </rule>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>
-          Specifies the routing key for the message. The routing key is used for routing
-          messages depending on the exchange configuration.
-        </doc>
-      </field>
-
-      <field name = "mandatory" domain = "bit" label = "indicate mandatory routing">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue. If this flag is set, the server will return an unroutable message with a
-          Return method. If this flag is zero, the server silently drops the message.
-        </doc>
-
-        <!-- Rule test name: was "amq_stream_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the mandatory flag.</doc>
-        </rule>
-      </field>
-
-      <field name = "immediate" domain = "bit" label = "request immediate delivery">
-        <doc>
-          This flag tells the server how to react if the message cannot be routed to a
-          queue consumer immediately. If this flag is set, the server will return an
-          undeliverable message with a Return method. If this flag is zero, the server
-          will queue the message, but with no guarantee that it will ever be consumed.
-        </doc>
-
-        <!-- Rule test name: was "amq_stream_00" -->    
-        <rule name = "01">
-          <doc>The server SHOULD implement the immediate flag.</doc>
-        </rule>
-      </field>
-    </method>
-
-    <method name = "return" content = "1" index = "50" label = "return a failed message">
-      <doc>
-        This method returns an undeliverable message that was published with the "immediate"
-        flag set, or an unroutable message published with the "mandatory" flag set. The
-        reply code and text provide information about the reason that the message was
-        undeliverable.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "reply-code" domain = "reply-code" />
-
-      <field name = "reply-text" domain = "reply-text" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "routing-key" domain = "shortstr" label = "Message routing key">
-        <doc>Specifies the routing key name specified when the message was published.</doc>
-      </field>
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "deliver" content = "1" index = "60"
-      label = "notify the client of a consumer message">
-      <doc>
-        This method delivers a message to the client, via a consumer. In the asynchronous
-        message delivery model, the client starts a consumer using the Consume method, then
-        the server responds with Deliver methods as and when messages arrive for that
-        consumer.
-      </doc>
-
-      <chassis name = "client" implement = "MUST" />
-
-      <field name = "consumer-tag" domain = "consumer-tag" />
-
-      <field name = "delivery-tag" domain = "delivery-tag" />
-
-      <field name = "exchange" domain = "exchange-name">
-        <doc>
-          Specifies the name of the exchange that the message was originally published to.
-        </doc>
-      </field>
-
-      <field name = "queue" domain = "queue-name">
-        <doc>
-          Specifies the name of the queue that the message came from. Note that a single
-          channel can start many consumers on different queues.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-  </class>
-
-  <!-- ==  TX  =============================================================== -->
-
-  <class name = "tx" handler = "channel" index = "90" label = "work with standard transactions">
-    <doc>
-      Standard transactions provide so-called "1.5 phase commit". We can ensure that work is
-      never lost, but there is a chance of confirmations being lost, so that messages may be
-      resent. Applications that use standard transactions must be able to detect and ignore
-      duplicate messages.
-    </doc>
-
-    <!-- TODO: Rule split? -->
-
-    <rule name = "01">
-      <doc>
-        An client using standard transactions SHOULD be able to track all messages received
-        within a reasonable period, and thus detect and reject duplicates of the same
-        message. It SHOULD NOT pass these to the application layer.
-      </doc>
-    </rule>
-
-    <doc type = "grammar">
-      tx                  = C:SELECT S:SELECT-OK
-                          / C:COMMIT S:COMMIT-OK
-                          / C:ROLLBACK S:ROLLBACK-OK
-    </doc>
-
-    <chassis name = "server" implement = "SHOULD" />
-    <chassis name = "client" implement = "MAY" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "select" synchronous = "1" index = "10" label = "select standard transaction mode">
-      <doc>
-        This method sets the channel to use standard transactions. The client must use this
-        method at least once on a channel before using the Commit or Rollback methods.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "select-ok" />
-    </method>
-
-    <method name = "select-ok" synchronous = "1" index = "11" label = "confirm transaction mode">
-      <doc>
-        This method confirms to the client that the channel was successfully set to use
-        standard transactions.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "commit" synchronous = "1" index = "20" label = "commit the current transaction">
-      <doc>
-        This method commits all messages published and acknowledged in the current
-        transaction. A new transaction starts immediately after a commit.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "commit-ok" />
-    </method>
-
-    <method name = "commit-ok" synchronous = "1" index = "21" label = "confirm a successful commit">
-      <doc>
-        This method confirms to the client that the commit succeeded. Note that if a commit
-        fails, the server raises a channel exception.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "rollback" synchronous = "1" index = "30"
-      label = "abandon the current transaction">
-      <doc>
-        This method abandons all messages published and acknowledged in the current
-        transaction. A new transaction starts immediately after a rollback.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "rollback-ok" />
-    </method>
-
-    <method name = "rollback-ok" synchronous = "1" index = "31" label = "confirm successful rollback">
-      <doc>
-        This method confirms to the client that the rollback succeeded. Note that if an
-        rollback fails, the server raises a channel exception.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  DTX  ============================================================== -->
-
-  <class name = "dtx" handler = "channel" index = "100" label = "work with distributed transactions">
-    <doc>
-      Distributed transactions provide so-called "2-phase commit". The AMQP distributed
-      transaction model supports the X-Open XA architecture and other distributed transaction
-      implementations. The Dtx class assumes that the server has a private communications
-      channel (not AMQP) to a distributed transaction coordinator.
-    </doc>
-    
-    <doc type = "grammar">
-      dtx                 = C:SELECT S:SELECT-OK
-                            C:START S:START-OK
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "select" synchronous = "1" index = "10" label = "select standard transaction mode">
-      <doc>
-        This method sets the channel to use distributed transactions. The client must use
-        this method at least once on a channel before using the Start method.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <response name = "select-ok" />
-    </method>
-
-    <method name = "select-ok" synchronous = "1" index = "11" label = "confirm transaction mode">
-      <doc>
-        This method confirms to the client that the channel was successfully set to use
-        distributed transactions.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "start" synchronous = "1" index = "20"
-      label = "start a new distributed transaction">
-      <doc>
-        This method starts a new distributed transaction. This must be the first method on a
-        new channel that uses the distributed transaction mode, before any methods that
-        publish or consume messages.
-      </doc>
-      <chassis name = "server" implement = "MAY" />
-      <response name = "start-ok" />
-      <field name = "dtx-identifier" domain = "shortstr" label = "transaction identifier">
-        <doc>
-          The distributed transaction key. This identifies the transaction so that the
-          AMQP server can coordinate with the distributed transaction coordinator.
-        </doc>
-        <assert check = "notnull" />
-      </field>
-    </method>
-
-    <method name = "start-ok" synchronous = "1" index = "21"
-      label = "confirm the start of a new distributed transaction">
-      <doc>
-        This method confirms to the client that the transaction started. Note that if a
-        start fails, the server raises a channel exception.
-      </doc>
-      <chassis name = "client" implement = "MUST" />
-    </method>
-  </class>
-
-  <!-- ==  TUNNEL  =========================================================== -->
-
-  <class name = "tunnel" handler = "tunnel" index = "110" label = "methods for protocol tunneling">
-    <doc>
-      The tunnel methods are used to send blocks of binary data - which can be serialised AMQP
-      methods or other protocol frames - between AMQP peers.
-    </doc>
-
-    <doc type = "grammar">
-      tunnel              = C:REQUEST
-                          / S:REQUEST
-    </doc>
-
-    <chassis name = "server" implement = "MAY" />
-    <chassis name = "client" implement = "MAY" />
-
-    <field name = "headers"     domain = "table"      label = "message header field table" />
-    <field name = "proxy-name"  domain = "shortstr"   label = "identity of tunnelling proxy" />
-    <field name = "data-name"   domain = "shortstr"   label = "name or type of message being tunnelled" />
-    <field name = "durable"     domain = "octet"      label = "message durability indicator" />
-    <field name = "broadcast"   domain = "octet"      label = "message broadcast mode" />
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name = "request" content = "1" index = "10" label = "sends a tunnelled method">
-      <doc>
-        This method tunnels a block of binary data, which can be an encoded
-        AMQP method or other data. The binary data is sent as the content for
-        the Tunnel.Request method.
-      </doc>
-      <chassis name = "server" implement = "MUST" />
-      <field name = "meta-data" domain = "table" label = "meta data for the tunnelled block">
-        <doc>
-          This field table holds arbitrary meta-data that the sender needs to
-          pass to the recipient.
-        </doc>
-      </field>
-    </method>
-  </class>
-</amqp>
diff --git a/cpp/gentools/xml-src/cluster-0.9.test.xml b/cpp/gentools/xml-src/cluster-0.9.test.xml
deleted file mode 100644
index 142e6c9380..0000000000
--- a/cpp/gentools/xml-src/cluster-0.9.test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-
-<amqp major="0" minor="9" port="5672" comment="AMQ protocol 0.80">
-
-<class name = "cluster" index = "101">
-
-<doc>
-    An extension that allows brokers to communicate in order to
-    provide a clustered service to clients.  
-</doc>
-
-<method name = "join" index="10">
-  <field name = "broker" type = "shortstr" />
-</method>
-
-<method name = "membership" index="20">
-  <field name = "members" type = "longstr" />
-</method>
-
-<method name = "synch" index="30">
-</method>
-
-<method name = "leave" index="40">
-  <field name = "broker" type = "shortstr" />
-</method>
-
-<method name = "suspect" index="50">
-  <field name = "broker" type = "shortstr" />
-</method>
-
-<method name = "ping" index="60">
-  <field name = "broker" type = "shortstr" />
-  <field name = "load" type = "long" />
-  <field name = "response required" type = "bit" />
-</method>
-
-</class>
-
-</amqp>
diff --git a/cpp/rubygen/amqpgen.rb b/cpp/rubygen/amqpgen.rb
index 7d635c99c2..044a2497e0 100755
--- a/cpp/rubygen/amqpgen.rb
+++ b/cpp/rubygen/amqpgen.rb
@@ -60,8 +60,7 @@ class AmqpField < AmqpElement
 
   # Get AMQP type for a domain name.
   def domain_type(name)
-    domain=elements["/amqp/domain[@name='#{name}']"]
-    (domain and domain.attributes["type"] or name)
+    @cache_domain_type ||= domain_type_impl(name)
   end
 
   # Get the AMQP type of this field.
@@ -70,6 +69,22 @@ class AmqpField < AmqpElement
     dt=domain_type d if d
     (dt or attributes["type"])
   end
+
+  # determine whether this type is defined as a struct in the spec
+  def defined_as_struct()
+    @cache_defined_as_struct ||= defined_as_struct_impl()
+  end
+
+private
+  def domain_type_impl(name)
+    domain=elements["/amqp/domain[@name='#{name}']"]
+    (domain and domain.attributes["type"] or name)
+  end
+
+  def defined_as_struct_impl()
+    domain_name = attributes["domain"]
+    elements["/amqp/domain[@name='#{domain_name}']/struct"]
+  end
 end
 
 # AMQP method element
@@ -98,6 +113,18 @@ class AmqpMethod < AmqpElement
     }
   end
 
+  def has_result?() 
+    @cache_has_result ||= elements["result/struct"] 
+  end
+
+  def result_struct() 
+    @cache_result_struct ||= has_result? ? AmqpStruct.new(elements["result/struct"], self) : nil
+  end
+
+  def is_server_method?()
+    @cache_is_server_method ||= elements["chassis[@name='server']"]
+  end
+
   def request?() responds_to().empty?; end
   def response?() not request?; end
 end
@@ -116,7 +143,25 @@ class AmqpClass < AmqpElement
   def amqp_methods_on(chassis)
     @cache_amqp_methods_on ||= { }
     @cache_amqp_methods_on[chassis] ||= elements.collect("method/chassis[@name='#{chassis}']/..") { |m| AmqpMethod.new(m,self) }.sort_by_name
+  end
 end
+
+
+# AMQP struct element.
+class AmqpStruct < AmqpElement
+  def initialize(xml,amqp) super; end
+
+  def type() attributes["type"];  end
+
+  def size() attributes["size"];  end
+
+  def result?() parent.name == "result"; end
+
+  def domain?() parent.name == "domain"; end
+
+  def fields()
+    @cache_fields ||= elements.collect("field") { |f| AmqpField.new(f,self); }
+  end
 end
 
 # AMQP root element.
@@ -152,9 +197,23 @@ class AmqpRoot < AmqpElement
     @cache_amqp_classes ||= elements.collect("class") { |c|
       AmqpClass.new(c,self) }.sort_by_name
   end
+
+  def amqp_structs()
+    @cache_amqp_structs ||= amqp_result_structs + amqp_domain_structs
+  end
+
+  def amqp_domain_structs()
+    @cache_amqp_domain_structs ||= elements.collect("domain/struct") { |s| AmqpStruct.new(s, self) }
+  end
+
+  def amqp_result_structs()
+    @cache_amqp_result_structs ||=  amqp_methods.collect { |m| m.result_struct }.compact
+  end
   
   # Return all methods on all classes.
-  def amqp_methods() amqp_classes.collect { |c| c.amqp_methods }.flatten;  end
+  def amqp_methods() 
+    @cache_amqp_methods ||= amqp_classes.collect { |c| c.amqp_methods }.flatten;  
+  end
   
   # Return all methods on chassis for all classes.
   def amqp_methods_on(chassis)
diff --git a/cpp/rubygen/cppgen.rb b/cpp/rubygen/cppgen.rb
index a3314c7e11..109005e743 100755
--- a/cpp/rubygen/cppgen.rb
+++ b/cpp/rubygen/cppgen.rb
@@ -62,9 +62,11 @@ end
 # Additional methods for AmqpField.
 class AmqpField
   def cppname() @cache_cppname ||= name.lcaps.cppsafe; end
-  def cpptype() @cache_cpptype ||= amqp_root.param_type(field_type); end
+  def cpptype() @cache_cpptype ||= defined_as_struct ? "const " + field_type.caps + "&" : amqp_root.param_type(field_type); end
+  def cpp_member_type() @cache_cpp_member_type ||= defined_as_struct ? field_type.caps : amqp_root.member_type(field_type); end
   def cppret_type() @cache_cpptype ||= amqp_root.return_type(field_type); end
   def type_name () @type_name ||= cpptype+" "+cppname; end
+  def bit?() field_type == "bit" end
 end
 
 # Additional methods for AmqpMethod
@@ -82,6 +84,32 @@ class AmqpClass
   end
 end
 
+class AmqpStruct
+  def cppname() 
+    @cache_cppname ||= cppname_impl()
+  end 
+
+private
+
+  def cppname_impl() 
+    #The name of the struct comes from the context it appears in:
+    #structs defined in a domain get their name from the domain
+    #element, structs defined in a result element get their name by
+    #appending 'Result' to the enclosing method name.
+    if (domain?)
+      parent.attributes["name"].caps
+    else
+      if (result?)
+        method = parent.parent
+        method.parent.attributes["name"].caps +  method.attributes["name"].caps + "Result"
+      else
+        raise "Bad struct context: expected struct to be child of <domain> or <result>"
+      end
+    end
+
+  end
+end
+
 # Additional methos for AmqpRoot
 class AmqpRoot
   # FIXME aconway 2007-06-20: fix u_int types, should be uint
@@ -97,6 +125,7 @@ class AmqpRoot
     "table"=>["FieldTable", "const FieldTable&", "const FieldTable&"],
     "content"=>["Content", "const Content&", "const Content&"],
     "rfc1982-long-set"=>["SequenceNumberSet", "const SequenceNumberSet&", "const SequenceNumberSet&"],
+    "long-struct"=>["string", "const string&"],
     "uuid"=>["string", "const string&"] # FIXME should be: ["Uuid", "const Uuid&", "const Uuid&"]
   }
 
diff --git a/cpp/rubygen/generate b/cpp/rubygen/generate
index 14b273b688..52313186ed 100755
--- a/cpp/rubygen/generate
+++ b/cpp/rubygen/generate
@@ -38,6 +38,10 @@ if makefile
   generator_files=Dir["**/*.rb"] << File.basename(__FILE__)
   Dir.chdir dir
   rgen_generator=generator_files.map{ |f| "$(rgen_dir)/#{f}" }
+  rgen_srcs=GenFiles.get.map{ |f| "#{Outdir}/#{f}" }
+  rgen_client_cpp = rgen_srcs.select { |f| f =~ /qpid\/client\/.+\.cpp$/ }
+  rgen_common_cpp = rgen_srcs.select { |f| f =~ /qpid\/framing\/.+\.cpp$/ }
+  rgen_h = rgen_srcs.select { |f| f =~ /.+\.h$/ }
 
   File.open(makefile, 'w') { |out|
     out << <<EOS
@@ -46,7 +50,13 @@ if makefile
 
 rgen_generator=#{rgen_generator.join(" \\\n	")}
 
-rgen_srcs=#{GenFiles.get.join(" \\\n	")}
+rgen_client_cpp=#{rgen_client_cpp.join(" \\\n	")}
+
+rgen_common_cpp=#{rgen_common_cpp.join(" \\\n	")}
+
+rgen_h=#{rgen_h.join(" \\\n	")}
+
+rgen_srcs=rgen_h rgen_client_cpp rgen_common_cpp
 
 if GENERATE
 $(rgen_srcs) $(srcdir)/#{File.basename makefile}: $(rgen_generator) $(specs)
diff --git a/cpp/rubygen/samples/runme b/cpp/rubygen/samples/runme
deleted file mode 100755
index e06d128707..0000000000
--- a/cpp/rubygen/samples/runme
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Run this script to generate code for the C++ broker.
-# 
-$: << ".."                      # Include .. in load path
-if ARGV.size < 2
-  puts "Usage: <output_directory> <amqp .xml files...>"
-  puts "Note: passing '-' as the output directory lists generated files."
-  exit 1
-end
-
-require 'amqpgen'
-Amqp=AmqpRoot.new(*ARGV[1,ARGV.size])
-
-require 'Proxy.rb'
-require 'Operations.rb'
-
-
diff --git a/cpp/rubygen/templates/InvocationVisitor.rb b/cpp/rubygen/templates/InvocationVisitor.rb
new file mode 100644
index 0000000000..f3ac03ece2
--- /dev/null
+++ b/cpp/rubygen/templates/InvocationVisitor.rb
@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+$: << ".."                      # Include .. in load path
+require 'cppgen'
+
+class InvocationVisitor < CppGen
+  
+  def initialize(outdir, amqp)
+    super(outdir, amqp)
+    @namespace="qpid::framing"
+    @classname="InvocationVisitor"
+    @filename="qpid/framing/InvocationVisitor"
+  end
+
+  def invocation_args(m)
+      if (m.amqp_parent.name == "message" && (m.name == "transfer" || m.name == "append"))
+        "body"
+      else
+        m.param_names.collect {|p| "body.get" + p.caps + "()" }.join(",\n")
+      end
+  end
+
+  def null_visit(m)
+    genl "void InvocationVisitor::visit(const #{m.body_name}&){}"
+  end
+
+  def define_visit(m)
+    if (m.fields.size > 0)
+      body = "body"
+    else
+      body = "/*body*/"
+    end
+    gen <<EOS
+void InvocationVisitor::visit(const #{m.body_name}& #{body})
+{
+    AMQP_ServerOperations::#{m.amqp_parent.cppname}Handler* ptr(0); 
+    if (invocable) {
+        ptr = dynamic_cast<AMQP_ServerOperations::#{m.amqp_parent.cppname}Handler*>(invocable);
+    } else {
+        ptr = ops->get#{m.amqp_parent.cppname}Handler();
+    }
+
+    if (ptr) {
+EOS
+    if (m.has_result?)      
+      indent(2) { genl "encode<#{m.result_struct.cppname.caps}>(ptr->#{m.cppname}(#{invocation_args(m)}), result);" }
+    else
+      indent(2) { genl "ptr->#{m.cppname}(#{invocation_args(m)});" }
+    end
+
+    gen <<EOS
+        succeeded = true;
+    } else {
+        succeeded = false;
+    }
+}
+EOS
+  end
+
+  def generate()
+    h_file("#{@filename}") {
+      include "AMQP_ServerOperations.h"
+      include "MethodBodyConstVisitor.h"
+      include "qpid/framing/StructHelper.h"
+      namespace(@namespace) { 
+        cpp_class("InvocationVisitor", ["public MethodBodyConstVisitor", "private StructHelper"]) {
+          indent { 
+            genl "AMQP_ServerOperations* const ops;" 
+            genl "Invocable* const invocable;" 
+            genl "std::string result;" 
+            genl "bool succeeded;" 
+          }
+          genl "public:"
+          indent { 
+            genl "InvocationVisitor(AMQP_ServerOperations* _ops) : ops(_ops), invocable(0) {}" 
+            genl "InvocationVisitor(Invocable* _invocable) : ops(0), invocable(_invocable) {}" 
+            genl "const std::string& getResult() const { return result; }"
+            genl "const bool hasResult() const { return !result.empty(); }"
+            genl "bool wasHandled() const { return succeeded; }"
+            genl "void clear();"
+            genl "virtual ~InvocationVisitor() {}" 
+          }
+          @amqp.amqp_methods.each { |m| genl "void visit(const #{m.body_name}&);" }
+        }
+      }
+    }
+
+    cpp_file("#{@filename}") {
+      include "InvocationVisitor.h"
+      @amqp.amqp_methods.each { |m| include m.body_name }
+      namespace(@namespace) { 
+        genl "void InvocationVisitor::clear() {"
+        indent { 
+          genl "succeeded = false;"
+          genl "result.clear();"
+        }
+        genl "}"
+        genl
+        @amqp.amqp_methods.each { |m| m.is_server_method? ? define_visit(m) : null_visit(m) }
+      }
+    }
+  end
+end
+
+InvocationVisitor.new(Outdir, Amqp).generate();
+
diff --git a/cpp/rubygen/samples/Operations.rb b/cpp/rubygen/templates/Operations.rb
index 6b0a24a26c..79b82a9d59 100755
--- a/cpp/rubygen/samples/Operations.rb
+++ b/cpp/rubygen/templates/Operations.rb
@@ -13,46 +13,69 @@ class OperationsGen < CppGen
   end
   
   def handler_method (m)
-    gen "\nvirtual void #{m.cppname}("
-    gen m.signature.join(",\n")
-    gen ") = 0;\n"
+    if (m.has_result?)
+      return_type = "#{m.amqp_parent.name.caps}#{m.cppname.caps}Result"
+    else
+      return_type = "void"
+    end
+    if (m.amqp_parent.name == "message" && (m.name == "transfer" || m.name == "append"))
+      gen "\nvirtual #{return_type} #{m.cppname}(const framing::AMQMethodBody& context) = 0;\n"
+    else
+      gen "\nvirtual #{return_type} #{m.cppname}("
+      gen m.signature.join(",\n")
+      gen ") = 0;\n"
+    end
   end
 
   def handler_classname(c) c.name.caps+"Handler"; end
 
   def handler_class(c)
-    handlerclass=handler_classname c
-    gen <<EOS
+    if (!c.amqp_methods_on(@chassis).empty?)
+      handlerclass=handler_classname c
+      gen <<EOS
 // ==================== class #{handlerclass} ====================
-class #{handlerclass} : Invocable {
+class #{handlerclass} : public virtual Invocable {
     // Constructors and destructors
   public:
     #{handlerclass}(){};
     virtual ~#{handlerclass}() {}
     // Protocol methods
 EOS
-    c.amqp_methods_on(@chassis).each { |m| handler_method(m) }
-    gen <<EOS
+      c.amqp_methods_on(@chassis).each { |m| handler_method(m) }
+      gen <<EOS
 }; // class #{handlerclass}
 
 
 EOS
+    end
   end
 
   def handler_get(c)
-    handlerclass=handler_classname c
-    gen "virtual #{handlerclass}* get#{handlerclass}() = 0;\n"
+    if (!c.amqp_methods_on(@chassis).empty?)
+      handlerclass=handler_classname c
+      gen "virtual #{handlerclass}* get#{handlerclass}() = 0;\n"
+    end
   end
 
   def generate()
-    h_file("#{@classname}.h") { 
+    h_file("qpid/framing/#{@classname}.h") { 
       gen <<EOS
 #include <sstream> 
 #include "qpid/framing/ProtocolVersion.h"
+#include "qpid/framing/amqp_structs.h"
 
 namespace qpid {
 namespace framing {
 
+class AMQMethodBody;
+
+class Invocable 
+{
+protected:
+    Invocable() {}        
+    virtual ~Invocable() {}        
+};
+
 class #{@classname} {
 
   public:
@@ -60,8 +83,8 @@ class #{@classname} {
 
     virtual ProtocolVersion getVersion() const = 0;
 
-    // Include framing constant declarations
-    #include "AMQP_Constants.h"
+    // Include framing constant declarations - why?
+    //#include "qpid/framing/AMQP_Constants.h"
 
     // Inner classes
 EOS
@@ -74,7 +97,7 @@ EOS
   indent { @amqp.amqp_classes.each { |c| handler_get(c) } }
   gen <<EOS
 }; /* class #{@classname} */
-}
+}}
 EOS
 }
   end
diff --git a/cpp/rubygen/templates/Session.rb b/cpp/rubygen/templates/Session.rb
index d5b6d9e8c2..0d5808318a 100644
--- a/cpp/rubygen/templates/Session.rb
+++ b/cpp/rubygen/templates/Session.rb
@@ -67,9 +67,9 @@ class SessionGen < CppGen
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/ProtocolVersion.h"
 #include "qpid/framing/MethodContent.h"
-#include "ConnectionImpl.h"
-#include "Response.h"
-#include "SessionCore.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/Response.h"
+#include "qpid/client/SessionCore.h"
 
 namespace qpid {
 namespace client {
diff --git a/cpp/rubygen/templates/structs.rb b/cpp/rubygen/templates/structs.rb
new file mode 100644
index 0000000000..972a0386b9
--- /dev/null
+++ b/cpp/rubygen/templates/structs.rb
@@ -0,0 +1,345 @@
+#!/usr/bin/env ruby
+# Usage: output_directory xml_spec_file [xml_spec_file...]
+# 
+$: << '..'
+require 'cppgen'
+
+class StructGen < CppGen
+
+  def initialize(outdir, amqp)
+    super(outdir, amqp)
+  end
+
+  EncodingMap={
+    "octet"=>"Octet",
+    "short"=>"Short",
+    "long"=>"Long",
+    "longlong"=>"LongLong",
+    "longstr"=>"LongString",
+    "shortstr"=>"ShortString",
+    "timestamp"=>"LongLong",
+    "uuid"=>"ShortString",#FIXME
+    "table"=>"FieldTable",
+    "content"=>"Content",
+    "long-struct"=>"LongString"
+  }
+  SizeMap={
+    "octet"=>"1",
+    "short"=>"2",
+    "long"=>"4",
+    "longlong"=>"8",
+    "timestamp"=>"8"
+  }
+
+  ValueTypes=["octet", "short", "long", "longlong", "timestamp"]
+
+  def printable_form(f)
+    if (f.cpptype == "u_int8_t")
+      return "(int) " + f.cppname
+    else
+      return f.cppname
+    end
+  end
+
+  def generate_encode(f, combined)
+    if (f.field_type == "bit")
+      genl "uint8_t #{f.cppname}_bits = #{f.cppname};"
+      count = 0
+      combined.each { |c| genl "#{f.cppname}_bits |= #{c.cppname} << #{count += 1};" }
+      genl "buffer.putOctet(#{f.cppname}_bits);"
+    else
+      encoded = EncodingMap[f.field_type]
+      if (encoded)
+        genl "buffer.put#{encoded}(#{f.cppname});"
+      else 
+        genl "#{f.cppname}.encode(buffer);"
+      end
+    end
+  end
+
+  def generate_decode(f, combined)
+    if (f.field_type == "bit")
+      genl "uint8_t #{f.cppname}_bits = buffer.getOctet();"
+      genl "#{f.cppname} = 1 & #{f.cppname}_bits;"
+      count = 0
+      combined.each { |c| genl "#{c.cppname} = (1 << #{count += 1}) & #{f.cppname}_bits;" }
+    else
+      encoded = EncodingMap[f.field_type]
+      if (encoded)
+        if (ValueTypes.include?(f.field_type))
+          genl "#{f.cppname} = buffer.get#{encoded}();"
+        else
+          genl "buffer.get#{encoded}(#{f.cppname});"
+        end
+      else 
+        genl "#{f.cppname}.decode(buffer);"
+      end
+    end
+  end
+
+  def generate_size(f, combined)
+    if (f.field_type == "bit")
+      names = ([f] + combined).collect {|g| g.cppname}
+      genl "+ 1 //#{names.join(", ")}"
+    else
+      size = SizeMap[f.field_type]
+      if (size)
+        genl "+ #{size} //#{f.cppname}"
+      elsif (f.cpp_member_type == "SequenceNumberSet")
+        genl "+ #{f.cppname}.encodedSize()"
+      else 
+        encoded = EncodingMap[f.field_type]        
+        gen "+ 4 " if encoded == "LongString"
+        gen "+ 1 " if encoded == "ShortString"
+        genl "+ #{f.cppname}.size()"
+      end
+    end
+  end
+
+  def process_fields(s)
+    last = nil
+    count = 0  
+    bits = []
+    s.fields.each { 
+      |f| if (last and last.bit? and f.bit? and count < 7) 
+            count += 1
+            bits << f
+          else
+            if (last and last.bit?)
+              yield last, bits
+              count = 0
+              bits = []
+            end
+            if (not f.bit?)
+              yield f
+            end
+            last = f
+          end
+    }
+    if (last and last.bit?)
+      yield last, bits
+    end
+  end
+
+  def methodbody_extra_defs(s)
+    gen <<EOS
+    using  AMQMethodBody::accept;
+    void accept(MethodBodyConstVisitor& v) const { v.visit(*this); }
+
+    inline ClassId amqpClassId() const { return CLASS_ID; }
+    inline MethodId amqpMethodId() const { return METHOD_ID; }
+EOS
+    if (s.is_server_method?)
+      gen <<EOS
+    void invoke(AMQP_ServerOperations& target)
+    {
+        target.get#{s.amqp_parent.cppname}Handler()->#{s.cppname}
+            (            
+EOS
+      if (s.amqp_parent.name == "message" && (s.name == "transfer" || s.name == "append"))
+        indent(4) { genl "*this" }
+      else
+        indent(4) { genl s.param_names.join(",\n") }
+      end
+    
+      genl <<EOS
+            );
+    }
+
+    bool invoke(Invocable* target)
+    {
+        AMQP_ServerOperations::#{s.amqp_parent.cppname}Handler* ptr 
+            = dynamic_cast<AMQP_ServerOperations::#{s.amqp_parent.cppname}Handler*>(target);
+        if (ptr) {
+            ptr->#{s.cppname}(
+EOS
+      if (s.amqp_parent.name == "message" && (s.name == "transfer" || s.name == "append"))
+        indent(5) { genl "*this" }
+      else
+        indent(5) { genl s.param_names.join(",\n") }
+      end
+
+      gen <<EOS
+                    );
+            return true;
+        } else {
+            return false;
+        }
+    }
+EOS
+      end
+  end
+
+  def define_constructor(name, s)
+    if (s.fields.size > 0)
+      genl "#{name}("
+      if (s.kind_of? AmqpMethod)
+        indent {gen "ProtocolVersion, "}
+      end
+      indent { gen s.fields.collect { |f| "#{f.cpptype} _#{f.cppname}" }.join(",\n") }
+      gen ")"
+      genl ": " if s.fields.size > 0
+      indent { gen s.fields.collect { |f| " #{f.cppname}(_#{f.cppname})" }.join(",\n") }
+      genl " {}"
+    end
+    if (s.kind_of? AmqpMethod)
+      genl "#{name}(ProtocolVersion=ProtocolVersion()) {}"
+    end
+  end
+
+  def define_accessors(f)
+    genl "void set#{f.name.caps}(#{f.cpptype} _#{f.cppname}) { #{f.cppname} = _#{f.cppname}; }"
+    genl "#{f.cpptype} get#{f.name.caps}() const { return #{f.cppname}; }"
+  end
+
+  def define_struct(s)
+    classname = s.cppname
+    inheritance = ""
+    if (s.kind_of? AmqpMethod)
+      classname = s.body_name
+      inheritance = ": public AMQMethodBody"
+    end
+
+    h_file("qpid/framing/#{classname}.h") { 
+      if (s.kind_of? AmqpMethod)
+        gen <<EOS
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "qpid/framing/MethodBodyConstVisitor.h"
+EOS
+      end
+
+      #need to include any nested struct definitions
+      s.fields.select {|f| f.defined_as_struct }.map {|f| include f.name.caps}
+
+      gen <<EOS
+
+#include <ostream>
+#include "qpid/framing/amqp_types_full.h"
+
+namespace qpid {
+namespace framing {
+
+class #{classname} #{inheritance} {
+EOS
+  indent { s.fields.each { |f| genl "#{f.cpp_member_type} #{f.cppname};" } }
+  genl "public:"
+  if (s.kind_of? AmqpMethod)
+    indent { genl "static const ClassId CLASS_ID = #{s.amqp_parent.index};" }
+    indent { genl "static const MethodId METHOD_ID = #{s.index};" }
+  end
+
+  if (s.kind_of? AmqpStruct)
+    if (s.type)
+      if (s.result?)
+        #as result structs have types that are only unique to the
+        #class, they have a class dependent qualifier added to them
+        #(this is inline with current python code but a formal
+        #solution is expected from the WG
+        indent { genl "static const uint16_t TYPE = #{s.type} + #{s.amqp_parent.amqp_parent.index} * 256;" } 
+      else
+        indent { genl "static const uint16_t TYPE = #{s.type};" } 
+      end
+    end
+  end
+
+  indent { 
+    define_constructor(classname, s)
+    genl ""
+    s.fields.each { |f| define_accessors(f) } 
+  }
+  if (s.kind_of? AmqpMethod)
+    methodbody_extra_defs(s)
+  end
+  if (s.kind_of? AmqpStruct)
+    indent {genl "friend std::ostream& operator<<(std::ostream&, const #{classname}&);" }
+  end
+
+  gen <<EOS
+    void encode(Buffer&) const;
+    void decode(Buffer&, uint32_t=0);
+    uint32_t size() const;
+    void print(std::ostream& out) const;
+}; /* class #{classname} */
+
+}}
+EOS
+    }
+    cpp_file("qpid/framing/#{classname}.cpp") { 
+      if (s.fields.size > 0)
+        buffer = "buffer"
+      else
+        buffer = "/*buffer*/"
+      end
+      gen <<EOS
+#include "#{classname}.h"
+
+using namespace qpid::framing;
+
+void #{classname}::encode(Buffer& #{buffer}) const
+{
+EOS
+  indent { process_fields(s) { |f, combined| generate_encode(f, combined) } } 
+  gen <<EOS
+}
+
+void #{classname}::decode(Buffer& #{buffer}, uint32_t /*size*/)
+{
+EOS
+  indent { process_fields(s) { |f, combined| generate_decode(f, combined) } } 
+  gen <<EOS
+}
+
+uint32_t #{classname}::size() const
+{
+    return 0
+EOS
+  indent { process_fields(s) { |f, combined| generate_size(f, combined) } } 
+  gen <<EOS
+        ;
+}
+
+void #{classname}::print(std::ostream& out) const
+{
+    out << "#{classname}: ";
+EOS
+  copy = Array.new(s.fields)
+  f = copy.shift
+  
+  indent { 
+    genl "out << \"#{f.name}=\" << #{printable_form(f)};" if f
+    copy.each { |f| genl "out << \"; #{f.name}=\" << #{printable_form(f)};" } 
+  } 
+  gen <<EOS
+}
+EOS
+
+  if (s.kind_of? AmqpStruct)
+    gen <<EOS
+namespace qpid{
+namespace framing{
+
+    std::ostream& operator<<(std::ostream& out, const #{classname}& s) 
+    {
+      s.print(out);
+      return out;
+    }
+
+}
+}
+EOS
+  end 
+
+}
+  end
+
+  def generate()
+    @amqp.amqp_structs.each { |s| define_struct(s) }
+    @amqp.amqp_methods.each { |m| define_struct(m) }
+    #generate a single include file containing the list of structs for convenience
+    h_file("qpid/framing/amqp_structs.h") { @amqp.amqp_structs.each { |s| genl "#include \"#{s.cppname}.h\"" } }
+  end
+end
+
+StructGen.new(ARGV[0], Amqp).generate()
+
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 98e38cf89a..70c43188d7 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -14,37 +14,23 @@ force:
 # AMQP_XML is defined in ../configure.ac
 specs=@AMQP_XML@ $(top_srcdir)/xml/cluster.xml
 
-EXTRA_DIST += generate.mk generate.sh $(generated_cpp) $(generated_h)  $(rgen_srcs) 
+EXTRA_DIST += $(rgen_h) 
 
-if GENERATE
-
-# Java code generator.
-# Must generate into a separate gen directory because otherwise
-# there's no way to figure out which files are generated.
-
-gentools_dir=$(top_srcdir)/gentools
 
-$(srcdir)/generate.mk $(generated_cpp) $(generated_h): generate.timestamp
-generate.timestamp: generate.sh $(specs) $(generator)
-	env gentools_dir=$(gentools_dir) specs="$(specs)" $(srcdir)/generate.sh
-	touch $@
-
-# Empty rule in case a generator file is renamed/removed.
-$(generator):
+if GENERATE
 
 maintainer-clean-local:
 	rm -rf gen
 
 # Ruby generator.
 rgen_dir=$(top_srcdir)/rubygen
-rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . $(specs) all $(srcdir)/rubygen.mk
+rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate $(srcdir)/gen $(specs) all $(srcdir)/rubygen.mk
 
 endif				# GENERATE
 
-include $(srcdir)/generate.mk
 include $(srcdir)/rubygen.mk
 
-DISTCLEANFILES=generate.mk rubygen.mk
+DISTCLEANFILES=rubygen.mk
 
 # Code generated by C++
 noinst_PROGRAMS=generate_MethodHolderMaxSize_h
@@ -110,6 +96,7 @@ libqpidcommon_la_LIBADD = \
   $(LIB_CLOCK_GETTIME)
 
 libqpidcommon_la_SOURCES = \
+  $(rgen_common_cpp) \
   $(platform_src) \
   qpid/framing/AMQBody.cpp \
   qpid/framing/AMQMethodBody.cpp \
@@ -137,13 +124,10 @@ libqpidcommon_la_SOURCES = \
   qpid/framing/FrameHandler.h \
   qpid/framing/HandlerUpdater.h \
   qpid/framing/Blob.h \
-  qpid/framing/AMQP_ClientProxy.cpp \
-  qpid/framing/AMQP_ServerProxy.cpp \
   qpid/framing/variant.h \
-  gen/qpid/framing/AMQP_HighestVersion.h \
+  qpid/framing/AMQP_HighestVersion.h \
   qpid/framing/Blob.cpp \
   qpid/framing/MethodHolder.h qpid/framing/MethodHolder.cpp \
-  qpid/framing/MethodHolder_construct.cpp \
   qpid/framing/MethodHolderMaxSize.h \
   qpid/Exception.cpp \
   qpid/Plugin.h \
@@ -217,6 +201,7 @@ libqpidbroker_la_SOURCES = \
 
 libqpidclient_la_LIBADD = libqpidcommon.la
 libqpidclient_la_SOURCES =			\
+  $(rgen_client_cpp) 				\
   qpid/client/ClientConnection.cpp		\
   qpid/client/ClientChannel.cpp			\
   qpid/client/ClientExchange.cpp		\
@@ -233,12 +218,12 @@ libqpidclient_la_SOURCES =			\
   qpid/client/FutureResponse.cpp		\
   qpid/client/FutureFactory.cpp			\
   qpid/client/ReceivedContent.cpp		\
-  qpid/client/Session.cpp			\
   qpid/client/SessionCore.cpp			\
   qpid/client/StateManager.cpp
 
 
 nobase_include_HEADERS = \
+  $(rgen_h) \
   $(platform_hdr) \
   qpid/broker/AccumulatedAck.h \
   qpid/broker/BrokerChannel.h \
@@ -329,7 +314,6 @@ nobase_include_HEADERS = \
   qpid/client/FutureFactory.h \
   qpid/client/ReceivedContent.h \
   qpid/client/Response.h \
-  qpid/client/Session.h \
   qpid/client/SessionCore.h \
   qpid/client/StateManager.h \
   qpid/framing/AMQBody.h \
@@ -357,6 +341,7 @@ nobase_include_HEADERS = \
   qpid/framing/SerializeHandler.h \
   qpid/framing/SequenceNumber.h \
   qpid/framing/SequenceNumberSet.h \
+  qpid/framing/StructHelper.h \
   qpid/framing/Value.h \
   qpid/framing/Visitor.h \
   qpid/framing/Uuid.h \
diff --git a/cpp/src/qpid/broker/BrokerAdapter.cpp b/cpp/src/qpid/broker/BrokerAdapter.cpp
index 77030855ff..024516fb7b 100644
--- a/cpp/src/qpid/broker/BrokerAdapter.cpp
+++ b/cpp/src/qpid/broker/BrokerAdapter.cpp
@@ -137,17 +137,17 @@ void BrokerAdapter::ExchangeHandlerImpl::delete_(uint16_t /*ticket*/, const stri
     broker.getExchanges().destroy(name);
 } 
 
-void BrokerAdapter::ExchangeHandlerImpl::query(u_int16_t /*ticket*/, const string& name)
+ExchangeQueryResult BrokerAdapter::ExchangeHandlerImpl::query(u_int16_t /*ticket*/, const string& name)
 {
     try {
         Exchange::shared_ptr exchange(broker.getExchanges().get(name));
-        client.queryOk(exchange->getType(), exchange->isDurable(), false, exchange->getArgs());
+        return ExchangeQueryResult(exchange->getType(), exchange->isDurable(), false, exchange->getArgs());
     } catch (const ChannelException& e) {
-        client.queryOk("", false, true, FieldTable());        
+        return ExchangeQueryResult("", false, true, FieldTable());        
     }
 }
 
-void BrokerAdapter::BindingHandlerImpl::query(u_int16_t /*ticket*/,
+BindingQueryResult BrokerAdapter::BindingHandlerImpl::query(u_int16_t /*ticket*/,
                                                const std::string& exchangeName,
                                                const std::string& queueName,
                                                const std::string& key,
@@ -164,24 +164,40 @@ void BrokerAdapter::BindingHandlerImpl::query(u_int16_t /*ticket*/,
     }
 
     if (!exchange) {
-        client.queryOk(true, false, false, false, false);
+        return BindingQueryResult(true, false, false, false, false);
     } else if (!queueName.empty() && !queue) {
-        client.queryOk(false, true, false, false, false);
+        return BindingQueryResult(false, true, false, false, false);
     } else if (exchange->isBound(queue, key.empty() ? 0 : &key, args.count() > 0 ? &args : &args)) {
-            client.queryOk(false, false, false, false, false);
+        return BindingQueryResult(false, false, false, false, false);
     } else {
         //need to test each specified option individually
         bool queueMatched = queueName.empty() || exchange->isBound(queue, 0, 0);
         bool keyMatched = key.empty() || exchange->isBound(Queue::shared_ptr(), &key, 0);
         bool argsMatched = args.count() == 0 || exchange->isBound(Queue::shared_ptr(), 0, &args);
 
-        client.queryOk(false, false, !queueMatched, !keyMatched, !argsMatched);
+        return BindingQueryResult(false, false, !queueMatched, !keyMatched, !argsMatched);
     }
 }
 
+QueueQueryResult BrokerAdapter::QueueHandlerImpl::query(const string& name)
+{
+    Queue::shared_ptr queue = getQueue(name);
+    Exchange::shared_ptr alternateExchange = queue->getAlternateExchange();
+
+    return QueueQueryResult(queue->getName(), 
+                            alternateExchange ? alternateExchange->getName() : "", 
+                            queue->isDurable(), 
+                            queue->hasExclusiveOwner(),
+                            queue->isAutoDelete(),
+                            queue->getSettings(),
+                            queue->getMessageCount(),
+                            queue->getConsumerCount());
+
+}
+
 void BrokerAdapter::QueueHandlerImpl::declare(uint16_t /*ticket*/, const string& name, const string& alternateExchange,
                                               bool passive, bool durable, bool exclusive, 
-                                              bool autoDelete, bool nowait, const qpid::framing::FieldTable& arguments){
+                                              bool autoDelete, const qpid::framing::FieldTable& arguments){
     Exchange::shared_ptr alternate;
     if (!alternateExchange.empty()) {
         alternate = broker.getExchanges().get(alternateExchange);
@@ -223,11 +239,6 @@ void BrokerAdapter::QueueHandlerImpl::declare(uint16_t /*ticket*/, const string&
             405,
             format("Cannot grant exclusive access to queue '%s'")
             % queue->getName());
-    if (!nowait) {
-        string queueName = queue->getName();
-        client.declareOk(
-            queueName, queue->getMessageCount(), queue->getConsumerCount());
-    }
 } 
         
 void BrokerAdapter::QueueHandlerImpl::bind(uint16_t /*ticket*/, const string& queueName, 
@@ -269,17 +280,13 @@ BrokerAdapter::QueueHandlerImpl::unbind(uint16_t /*ticket*/,
 
 }
         
-void BrokerAdapter::QueueHandlerImpl::purge(uint16_t /*ticket*/, const string& queueName, bool nowait){
-
-    Queue::shared_ptr queue = getQueue(queueName);
-    int count = queue->purge();
-    if(!nowait) client.purgeOk( count);
+void BrokerAdapter::QueueHandlerImpl::purge(uint16_t /*ticket*/, const string& queue){
+    getQueue(queue)->purge();
 } 
         
 void BrokerAdapter::QueueHandlerImpl::delete_(uint16_t /*ticket*/, const string& queue, 
-                                              bool ifUnused, bool ifEmpty, bool nowait){
+                                              bool ifUnused, bool ifEmpty){
     ChannelException error(0, "");
-    int count(0);
     Queue::shared_ptr q = getQueue(queue);
     if(ifEmpty && q->getMessageCount() > 0){
         throw ChannelException(406, "Queue not empty.");
@@ -291,14 +298,10 @@ void BrokerAdapter::QueueHandlerImpl::delete_(uint16_t /*ticket*/, const string&
             QueueVector::iterator i = find(connection.exclusiveQueues.begin(), connection.exclusiveQueues.end(), q);
             if(i < connection.exclusiveQueues.end()) connection.exclusiveQueues.erase(i);
         }
-        count = q->getMessageCount();
         q->destroy();
         broker.getQueues().destroy(queue);
         q->unbind(broker.getExchanges(), q);
     }
-
-    if(!nowait)
-        client.deleteOk(count);
 } 
               
         
@@ -333,10 +336,8 @@ void BrokerAdapter::BasicHandlerImpl::consume(uint16_t /*ticket*/,
     queue->requestDispatch();
 } 
         
-void BrokerAdapter::BasicHandlerImpl::cancel(const string& consumerTag, bool nowait){
+void BrokerAdapter::BasicHandlerImpl::cancel(const string& consumerTag){
     channel.cancel(consumerTag);
-
-    if(!nowait) client.cancelOk(consumerTag);
 } 
         
 void BrokerAdapter::BasicHandlerImpl::publish(uint16_t /*ticket*/, 
diff --git a/cpp/src/qpid/broker/BrokerAdapter.h b/cpp/src/qpid/broker/BrokerAdapter.h
index 3fe2eb9eba..99b7f14525 100644
--- a/cpp/src/qpid/broker/BrokerAdapter.h
+++ b/cpp/src/qpid/broker/BrokerAdapter.h
@@ -121,7 +121,7 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations
                      const qpid::framing::FieldTable& arguments); 
         void delete_(uint16_t ticket,
                      const std::string& exchange, bool ifUnused); 
-        void query(u_int16_t ticket, const string& name);
+        framing::ExchangeQueryResult query(u_int16_t ticket, const string& name);
       private:
         void checkType(Exchange::shared_ptr exchange, const std::string& type);
         void checkAlternate(Exchange::shared_ptr exchange, Exchange::shared_ptr alternate);
@@ -134,11 +134,11 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations
     public:
         BindingHandlerImpl(BrokerAdapter& parent) : HandlerImplType(parent) {}
 
-        void query(u_int16_t ticket,
-                   const std::string& exchange,
-                   const std::string& queue,
-                   const std::string& routingKey,
-                   const framing::FieldTable& arguments);
+        framing::BindingQueryResult query(u_int16_t ticket,
+                                          const std::string& exchange,
+                                          const std::string& queue,
+                                          const std::string& routingKey,
+                                          const framing::FieldTable& arguments);
     };
 
     class QueueHandlerImpl :
@@ -151,7 +151,7 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations
         void declare(uint16_t ticket, const std::string& queue,
                      const std::string& alternateExchange, 
                      bool passive, bool durable, bool exclusive, 
-                     bool autoDelete, bool nowait,
+                     bool autoDelete,
                      const qpid::framing::FieldTable& arguments); 
         void bind(uint16_t ticket, const std::string& queue, 
                   const std::string& exchange, const std::string& routingKey,
@@ -161,11 +161,10 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations
                     const std::string& exchange,
                     const std::string& routingKey,
                     const qpid::framing::FieldTable& arguments );
-        void purge(uint16_t ticket, const std::string& queue, 
-                   bool nowait); 
+        framing::QueueQueryResult query(const string& queue);
+        void purge(uint16_t ticket, const std::string& queue); 
         void delete_(uint16_t ticket, const std::string& queue,
-                     bool ifUnused, bool ifEmpty, 
-                     bool nowait);
+                     bool ifUnused, bool ifEmpty);
     };
 
     class BasicHandlerImpl :
@@ -179,18 +178,15 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations
 
         void qos(uint32_t prefetchSize,
                  uint16_t prefetchCount, bool global); 
-        void consume(
-            uint16_t ticket, const std::string& queue,
-            const std::string& consumerTag, bool noLocal, bool noAck,
-            bool exclusive, bool nowait,
-            const qpid::framing::FieldTable& fields); 
-        void cancel(const std::string& consumerTag,
-                    bool nowait); 
+        void consume(uint16_t ticket, const std::string& queue,
+                     const std::string& consumerTag, 
+                     bool noLocal, bool noAck, bool exclusive, bool nowait,
+                     const qpid::framing::FieldTable& fields); 
+        void cancel(const std::string& consumerTag); 
         void publish(uint16_t ticket,
                      const std::string& exchange, const std::string& routingKey, 
                      bool rejectUnroutable, bool immediate); 
-        void get(uint16_t ticket, const std::string& queue,
-                 bool noAck); 
+        void get(uint16_t ticket, const std::string& queue, bool noAck); 
         void ack(uint64_t deliveryTag, bool multiple); 
         void reject(uint64_t deliveryTag, bool requeue); 
         void recover(bool requeue); 
diff --git a/cpp/src/qpid/broker/BrokerChannel.cpp b/cpp/src/qpid/broker/BrokerChannel.cpp
index e135e960c4..0dc4bed661 100644
--- a/cpp/src/qpid/broker/BrokerChannel.cpp
+++ b/cpp/src/qpid/broker/BrokerChannel.cpp
@@ -374,7 +374,7 @@ void Channel::ack(DeliveryId first, DeliveryId last, bool cumulative)
         //just acked single element (move end past it)
         ++end;
     }
-    
+
     for_each(start, end, boost::bind(&Channel::acknowledged, this, _1));
     
     if (txBuffer.get()) {
diff --git a/cpp/src/qpid/broker/BrokerQueue.h b/cpp/src/qpid/broker/BrokerQueue.h
index 857a7adfc2..35aa954c1e 100644
--- a/cpp/src/qpid/broker/BrokerQueue.h
+++ b/cpp/src/qpid/broker/BrokerQueue.h
@@ -145,8 +145,10 @@ namespace qpid {
             inline const string& getName() const { return name; }
             inline const bool isExclusiveOwner(const ConnectionToken* const o) const { return o == owner; }
             inline bool hasExclusiveConsumer() const { return exclusive; }
+            inline bool hasExclusiveOwner() const { return owner != 0; }
             inline bool isDurable() const { return store != 0; }
-
+            inline const framing::FieldTable& getSettings() const { return settings; }
+            inline bool isAutoDelete() const { return autodelete; }
             bool canAutoDelete() const;
 
             bool enqueue(TransactionContext* ctxt, Message::shared_ptr& msg);
diff --git a/cpp/src/qpid/broker/DtxHandlerImpl.cpp b/cpp/src/qpid/broker/DtxHandlerImpl.cpp
index 8b3629dff9..5a69ff0d65 100644
--- a/cpp/src/qpid/broker/DtxHandlerImpl.cpp
+++ b/cpp/src/qpid/broker/DtxHandlerImpl.cpp
@@ -22,19 +22,9 @@
 #include "BrokerChannel.h"
 
 using namespace qpid::broker;
-using qpid::framing::AMQP_ClientProxy;
-using qpid::framing::Buffer;
-using qpid::framing::FieldTable;
+using namespace qpid::framing;
 using std::string;
 
-DtxHandlerImpl::DtxHandlerImpl(CoreRefs& parent) : 
-    CoreRefs(parent),
-    dClient(AMQP_ClientProxy::DtxDemarcation::get(proxy)),
-    cClient(AMQP_ClientProxy::DtxCoordination::get(proxy))
-
-{
-}
-
 const int XA_RBROLLBACK(1);
 const int XA_RBTIMEOUT(2);
 const int XA_HEURHAZ(3);
@@ -44,6 +34,7 @@ const int XA_HEURMIX(6);
 const int XA_RDONLY(7);
 const int XA_OK(8);
 
+DtxHandlerImpl::DtxHandlerImpl(CoreRefs& parent) : CoreRefs(parent) {}
 
 // DtxDemarcationHandler:
 
@@ -53,10 +44,10 @@ void DtxHandlerImpl::select()
     channel.selectDtx();
 }
 
-void DtxHandlerImpl::end(u_int16_t /*ticket*/,
-                         const string& xid,
-                         bool fail,
-                         bool suspend)
+DtxDemarcationEndResult DtxHandlerImpl::end(u_int16_t /*ticket*/,
+                                            const string& xid,
+                                            bool fail,
+                                            bool suspend)
 {
     try {
         if (fail) {
@@ -64,7 +55,7 @@ void DtxHandlerImpl::end(u_int16_t /*ticket*/,
             if (suspend) {
                 throw ConnectionException(503, "End and suspend cannot both be set.");
             } else {
-                dClient.endOk(XA_RBROLLBACK);
+                return DtxDemarcationEndResult(XA_RBROLLBACK);
             }
         } else {
             if (suspend) {
@@ -72,14 +63,14 @@ void DtxHandlerImpl::end(u_int16_t /*ticket*/,
             } else {
                 channel.endDtx(xid, false);
             }
-            dClient.endOk(XA_OK);
+            return DtxDemarcationEndResult(XA_OK);
         }
     } catch (const DtxTimeoutException& e) {
-        dClient.endOk(XA_RBTIMEOUT);        
+        return DtxDemarcationEndResult(XA_RBTIMEOUT);        
     }
 }
 
-void DtxHandlerImpl::start(u_int16_t /*ticket*/,
+DtxDemarcationStartResult DtxHandlerImpl::start(u_int16_t /*ticket*/,
                            const string& xid,
                            bool join,
                            bool resume)
@@ -93,52 +84,52 @@ void DtxHandlerImpl::start(u_int16_t /*ticket*/,
         } else {
             channel.startDtx(xid, broker.getDtxManager(), join);
         }
-        dClient.startOk(XA_OK);
+        return DtxDemarcationStartResult(XA_OK);
     } catch (const DtxTimeoutException& e) {
-        dClient.startOk(XA_RBTIMEOUT);        
+        return DtxDemarcationStartResult(XA_RBTIMEOUT);        
     }
 }
 
 // DtxCoordinationHandler:
 
-void DtxHandlerImpl::prepare(u_int16_t /*ticket*/,
+DtxCoordinationPrepareResult DtxHandlerImpl::prepare(u_int16_t /*ticket*/,
                              const string& xid)
 {
     try {
         bool ok = broker.getDtxManager().prepare(xid);
-        cClient.prepareOk(ok ? XA_OK : XA_RBROLLBACK);
+        return DtxCoordinationPrepareResult(ok ? XA_OK : XA_RBROLLBACK);
     } catch (const DtxTimeoutException& e) {
-        cClient.prepareOk(XA_RBTIMEOUT);        
+        return DtxCoordinationPrepareResult(XA_RBTIMEOUT);        
     }
 }
 
-void DtxHandlerImpl::commit(u_int16_t /*ticket*/,
+DtxCoordinationCommitResult DtxHandlerImpl::commit(u_int16_t /*ticket*/,
                             const string& xid,
                             bool onePhase)
 {
     try {
         bool ok = broker.getDtxManager().commit(xid, onePhase);
-        cClient.commitOk(ok ? XA_OK : XA_RBROLLBACK);
+        return DtxCoordinationCommitResult(ok ? XA_OK : XA_RBROLLBACK);
     } catch (const DtxTimeoutException& e) {
-        cClient.commitOk(XA_RBTIMEOUT);        
+        return DtxCoordinationCommitResult(XA_RBTIMEOUT);        
     }
 }
 
 
-void DtxHandlerImpl::rollback(u_int16_t /*ticket*/,
+DtxCoordinationRollbackResult DtxHandlerImpl::rollback(u_int16_t /*ticket*/,
                               const string& xid )
 {
     try {
         broker.getDtxManager().rollback(xid);
-        cClient.rollbackOk(XA_OK);
+        return DtxCoordinationRollbackResult(XA_OK);
     } catch (const DtxTimeoutException& e) {
-        cClient.rollbackOk(XA_RBTIMEOUT);        
+        return DtxCoordinationRollbackResult(XA_RBTIMEOUT);        
     }
 }
 
-void DtxHandlerImpl::recover(u_int16_t /*ticket*/,
-                             bool /*startscan*/,
-                             bool /*endscan*/ )
+DtxCoordinationRecoverResult DtxHandlerImpl::recover(u_int16_t /*ticket*/,
+                                                     bool /*startscan*/,
+                                                     bool /*endscan*/ )
 {
     //TODO: what do startscan and endscan actually mean?
 
@@ -169,7 +160,7 @@ void DtxHandlerImpl::recover(u_int16_t /*ticket*/,
 
     FieldTable response;
     response.setString("xids", data);
-    cClient.recoverOk(response);
+    return DtxCoordinationRecoverResult(response);
 }
 
 void DtxHandlerImpl::forget(u_int16_t /*ticket*/,
@@ -179,10 +170,10 @@ void DtxHandlerImpl::forget(u_int16_t /*ticket*/,
     throw ConnectionException(503, boost::format("Forget is invalid. Branch with xid %1% not heuristically completed!") % xid);
 }
 
-void DtxHandlerImpl::getTimeout(const string& xid)
+DtxCoordinationGetTimeoutResult DtxHandlerImpl::getTimeout(const string& xid)
 {
     uint32_t timeout = broker.getDtxManager().getTimeout(xid);
-    cClient.getTimeoutOk(timeout);    
+    return DtxCoordinationGetTimeoutResult(timeout);    
 }
 
 
diff --git a/cpp/src/qpid/broker/DtxHandlerImpl.h b/cpp/src/qpid/broker/DtxHandlerImpl.h
index 067ba47fb5..da6379b26c 100644
--- a/cpp/src/qpid/broker/DtxHandlerImpl.h
+++ b/cpp/src/qpid/broker/DtxHandlerImpl.h
@@ -31,34 +31,34 @@ class DtxHandlerImpl
       public framing::AMQP_ServerOperations::DtxCoordinationHandler,
       public framing::AMQP_ServerOperations::DtxDemarcationHandler
 {    
-    framing::AMQP_ClientProxy::DtxDemarcation dClient;
-    framing::AMQP_ClientProxy::DtxCoordination cClient;
 public:
     DtxHandlerImpl(CoreRefs& parent);
 
     // DtxCoordinationHandler:
 
-    void commit(u_int16_t ticket, const std::string& xid, bool onePhase);
+    framing::DtxCoordinationCommitResult commit(u_int16_t ticket, const std::string& xid, bool onePhase);
 
     void forget(u_int16_t ticket, const std::string& xid);
 
-    void getTimeout(const std::string& xid);
+    framing::DtxCoordinationGetTimeoutResult getTimeout(const std::string& xid);
 
-    void prepare(u_int16_t ticket, const std::string& xid);
+    framing::DtxCoordinationPrepareResult prepare(u_int16_t ticket, const std::string& xid);
 
-    void recover(u_int16_t ticket, bool startscan, bool endscan);
+    framing::DtxCoordinationRecoverResult recover(u_int16_t ticket, bool startscan, bool endscan);
 
-    void rollback(u_int16_t ticket, const std::string& xid);
+    framing::DtxCoordinationRollbackResult rollback(u_int16_t ticket, const std::string& xid);
 
     void setTimeout(u_int16_t ticket, const std::string& xid, u_int32_t timeout);
 
     // DtxDemarcationHandler:
-
-    void end(u_int16_t ticket, const std::string& xid, bool fail, bool suspend);
-
+    
+    framing::DtxDemarcationEndResult end(u_int16_t ticket, const std::string& xid, bool fail, bool suspend);
+    
     void select();
+    
+    framing::DtxDemarcationStartResult start(u_int16_t ticket, const std::string& xid, bool join, bool resume);
+
 
-    void start(u_int16_t ticket, const std::string& xid, bool join, bool resume);
 };
 
 
diff --git a/cpp/src/qpid/broker/MessageHandlerImpl.cpp b/cpp/src/qpid/broker/MessageHandlerImpl.cpp
index 3f407c11f7..ce1fa1e028 100644
--- a/cpp/src/qpid/broker/MessageHandlerImpl.cpp
+++ b/cpp/src/qpid/broker/MessageHandlerImpl.cpp
@@ -87,19 +87,21 @@ MessageHandlerImpl::offset(uint64_t /*value*/ )
 }
 
 void
-MessageHandlerImpl::consume(uint16_t /*ticket*/,
+MessageHandlerImpl::subscribe(uint16_t /*ticket*/,
                             const string& queueName,
                             const string& destination,
                             bool noLocal,
-                            bool noAck,
+                            u_int8_t confirmMode,
+                            u_int8_t /*acquireMode*/,//TODO: implement acquire modes
                             bool exclusive,
                             const framing::FieldTable& filter )
 {
     Queue::shared_ptr queue = getQueue(queueName);
     if(!destination.empty() && channel.exists(destination))
         throw ConnectionException(530, "Consumer tags must be unique");
+
     string tag = destination;
-    channel.consume(MessageMessage::getToken(destination), tag, queue, noLocal, !noAck, exclusive, &filter);
+    channel.consume(MessageMessage::getToken(destination), tag, queue, noLocal, confirmMode == 1, exclusive, &filter);
     // Dispatch messages as there is now a consumer.
     queue->requestDispatch();
 }
@@ -153,8 +155,9 @@ MessageHandlerImpl::recover(bool requeue)
 }
 
 void
-MessageHandlerImpl::reject(uint16_t /*code*/, const string& /*text*/ )
+MessageHandlerImpl::reject(const SequenceNumberSet& /*transfers*/, uint16_t /*code*/, const string& /*text*/ )
 {
+    //TODO: implement
 }
 
 void
@@ -210,5 +213,14 @@ void MessageHandlerImpl::stop(const std::string& destination)
     channel.stop(destination);        
 }
 
+void MessageHandlerImpl::acquire(const SequenceNumberSet& /*transfers*/, u_int8_t /*mode*/)
+{
+    throw ConnectionException(540, "Not yet implemented");
+}
+
+void MessageHandlerImpl::release(const SequenceNumberSet& /*transfers*/)
+{
+    throw ConnectionException(540, "Not yet implemented");
+}
 
 }} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/MessageHandlerImpl.h b/cpp/src/qpid/broker/MessageHandlerImpl.h
index 20cae46da4..f4d9fa0c76 100644
--- a/cpp/src/qpid/broker/MessageHandlerImpl.h
+++ b/cpp/src/qpid/broker/MessageHandlerImpl.h
@@ -49,14 +49,6 @@ class MessageHandlerImpl :
 
     void close(const std::string& reference );
 
-    void consume(uint16_t ticket,
-                  const std::string& queue,
-                  const std::string& destination,
-                  bool noLocal,
-                  bool noAck,
-                  bool exclusive,
-                  const framing::FieldTable& filter );
-
     void empty();
 
     void get(uint16_t ticket,
@@ -76,8 +68,9 @@ class MessageHandlerImpl :
 
     void recover(bool requeue );
 
-    void reject(uint16_t code,
-                 const std::string& text );
+    void reject(const framing::SequenceNumberSet& transfers,
+                uint16_t code,
+                const std::string& text );
 
     void resume(const std::string& reference,
                  const std::string& identifier );
@@ -92,6 +85,19 @@ class MessageHandlerImpl :
 
     void stop(const std::string& destination);
 
+    void acquire(const framing::SequenceNumberSet& transfers, u_int8_t mode);
+
+    void release(const framing::SequenceNumberSet& transfers);
+
+    void subscribe(u_int16_t ticket,
+                   const string& queue,
+                   const string& destination,
+                   bool noLocal,
+                   u_int8_t confirmMode,
+                   u_int8_t acquireMode,
+                   bool exclusive,
+                   const framing::FieldTable& filter);
+
   private:
     ReferenceRegistry references;
 };
diff --git a/cpp/src/qpid/broker/SemanticHandler.cpp b/cpp/src/qpid/broker/SemanticHandler.cpp
index b7aa2aad25..f65e450e82 100644
--- a/cpp/src/qpid/broker/SemanticHandler.cpp
+++ b/cpp/src/qpid/broker/SemanticHandler.cpp
@@ -22,8 +22,10 @@
 #include "SemanticHandler.h"
 #include "BrokerAdapter.h"
 #include "qpid/framing/ChannelAdapter.h"
-#include "qpid/framing/ExecutionCompleteBody.h"
 #include "qpid/framing/ChannelCloseOkBody.h"
+#include "qpid/framing/ExecutionCompleteBody.h"
+#include "qpid/framing/ExecutionResultBody.h"
+#include "qpid/framing/InvocationVisitor.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;
@@ -66,6 +68,11 @@ void SemanticHandler::handleMethod(framing::AMQMethodBody* method)
 {
     try {
         if (!method->invoke(this)) {
+            //temporary hack until channel management is moved to its own handler:
+            if (method->amqpClassId() != ChannelOpenBody::CLASS_ID) {
+                ++(incoming.lwm);
+            }
+
             //else do the usual:
             handleL4(method);
             //(if the frameset is complete) we can move the execution-mark
@@ -73,7 +80,9 @@ void SemanticHandler::handleMethod(framing::AMQMethodBody* method)
             
             //temporary hack until channel management is moved to its own handler:
             if (method->amqpClassId() != ChannelOpenBody::CLASS_ID) {
-                ++(incoming.hwm);
+                //TODO: need to account for async store opreations
+                //when this command is a message publication
+                ++(incoming.hwm);                
             }
             
             //note: need to be more sophisticated than this if we execute
@@ -85,7 +94,7 @@ void SemanticHandler::handleMethod(framing::AMQMethodBody* method)
     }
 }
 
-void SemanticHandler::complete(uint32_t cumulative, SequenceNumberSet range) 
+void SemanticHandler::complete(uint32_t cumulative, const SequenceNumberSet& range) 
 {
     //record: 
     SequenceNumber mark(cumulative);
@@ -98,7 +107,7 @@ void SemanticHandler::complete(uint32_t cumulative, SequenceNumberSet range)
     if (range.size() % 2) { //must be even number        
         throw ConnectionException(530, "Received odd number of elements in ranged mark");
     } else {
-        for (SequenceNumberSet::iterator i = range.begin(); i != range.end(); i++) {
+        for (SequenceNumberSet::const_iterator i = range.begin(); i != range.end(); i++) {
             channel.ackRange((uint64_t) i->getValue(), (uint64_t) (++i)->getValue());
         }
     }
@@ -113,6 +122,25 @@ void SemanticHandler::flush()
         ChannelAdapter::send(ExecutionCompleteBody(getVersion(), incoming.hwm.getValue(), SequenceNumberSet()));
     }
 }
+void SemanticHandler::sync()
+{
+    //for now, just treat as flush; will need to get more clever when we deal with async publication
+    flush();
+}
+
+void SemanticHandler::noop()
+{
+    //Do nothing... 
+    //
+    //is this an L3 control? or is it an L4 command? 
+    //if the former, of what use is it?
+    //if the latter it may contain a synch request... but its odd to have it in this class
+}
+
+void SemanticHandler::result(uint32_t /*command*/, const std::string& /*data*/)
+{
+    //never actually sent by client at present
+}
 
 void SemanticHandler::handleL4(framing::AMQMethodBody* method)
 {
@@ -124,7 +152,13 @@ void SemanticHandler::handleL4(framing::AMQMethodBody* method)
                 throw ConnectionException(504, out.str());
             }
         } else {
-            method->invoke(*adapter);
+            InvocationVisitor v(adapter.get());
+            method->accept(v);
+            if (!v.wasHandled()) {
+                throw ConnectionException(540, "Not implemented");
+            } else if (v.hasResult()) {
+                ChannelAdapter::send(ExecutionResultBody(getVersion(), incoming.lwm.getValue(), v.getResult()));
+            }
         }
     }catch(const ChannelException& e){
         adapter->getProxy().getChannel().close(
diff --git a/cpp/src/qpid/broker/SemanticHandler.h b/cpp/src/qpid/broker/SemanticHandler.h
index 6748da8500..672c6ad929 100644
--- a/cpp/src/qpid/broker/SemanticHandler.h
+++ b/cpp/src/qpid/broker/SemanticHandler.h
@@ -79,8 +79,11 @@ public:
     void handle(framing::AMQFrame& frame);
 
     //execution class method handlers:
-    void complete(uint32_t cumulativeExecutionMark, framing::SequenceNumberSet range);    
+    void complete(uint32_t cumulativeExecutionMark, const framing::SequenceNumberSet& range);    
     void flush();
+    void noop();
+    void result(uint32_t command, const std::string& data);
+    void sync();
 };
 
 }}
diff --git a/cpp/src/qpid/client/ClientChannel.cpp b/cpp/src/qpid/client/ClientChannel.cpp
index aa73e83328..d1cc4734eb 100644
--- a/cpp/src/qpid/client/ClientChannel.cpp
+++ b/cpp/src/qpid/client/ClientChannel.cpp
@@ -20,6 +20,7 @@
  */
 #include "qpid/log/Statement.h"
 #include <iostream>
+#include <sstream>
 #include "ClientChannel.h"
 #include "qpid/sys/Monitor.h"
 #include "ClientMessage.h"
@@ -54,7 +55,8 @@ class ScopedSync
 };
 
 Channel::Channel(bool _transactional, u_int16_t _prefetch) :
-    prefetch(_prefetch), transactional(_transactional), running(false)
+    prefetch(_prefetch), transactional(_transactional), running(false), 
+    uniqueId(true)/*could eventually be the session id*/, nameCounter(0)
 {
 }
 
@@ -103,20 +105,22 @@ void Channel::deleteExchange(Exchange& exchange, bool synch){
 }
 
 void Channel::declareQueue(Queue& queue, bool synch){
+    if (queue.getName().empty()) {
+        stringstream uniqueName;
+        uniqueName << uniqueId << "-queue-" << ++nameCounter;
+        queue.setName(uniqueName.str());
+    }
+
     FieldTable args;
     ScopedSync s(*session, synch);
-    Response r = session->queueDeclare(0, queue.getName(), empty, false/*passive*/, queue.isDurable(),
-                                       queue.isExclusive(), queue.isAutoDelete(), !synch, args);
+    session->queueDeclare(0, queue.getName(), empty, false/*passive*/, queue.isDurable(),
+                          queue.isExclusive(), queue.isAutoDelete(), args);
     
-    if(synch) {
-        if(queue.getName().length() == 0)
-            queue.setName(r.as<QueueDeclareOkBody>().getQueue());
-    }
 }
 
 void Channel::deleteQueue(Queue& queue, bool ifunused, bool ifempty, bool synch){
     ScopedSync s(*session, synch);
-    session->queueDelete(0, queue.getName(), ifunused, ifempty, !synch);
+    session->queueDelete(0, queue.getName(), ifunused, ifempty);
 }
 
 void Channel::bind(const Exchange& exchange, const Queue& queue, const std::string& key, const FieldTable& args, bool synch){
@@ -168,7 +172,7 @@ void Channel::cancel(const std::string& tag, bool synch) {
         consumers.erase(i);
     }
     ScopedSync s(*session, synch);
-    session->basicCancel(tag, !synch);
+    session->basicCancel(tag);
 }
 
 bool Channel::get(Message& msg, const Queue& queue, AckMode ackMode) {
diff --git a/cpp/src/qpid/client/ClientChannel.h b/cpp/src/qpid/client/ClientChannel.h
index 98e04db109..d73addc950 100644
--- a/cpp/src/qpid/client/ClientChannel.h
+++ b/cpp/src/qpid/client/ClientChannel.h
@@ -24,11 +24,12 @@
 #include <memory>
 #include <boost/scoped_ptr.hpp>
 #include "qpid/framing/amqp_framing.h"
+#include "qpid/framing/Uuid.h"
 #include "ClientExchange.h"
 #include "ClientMessage.h"
 #include "ClientQueue.h"
 #include "ConnectionImpl.h"
-#include "Session.h"
+#include "qpid/client/Session.h"
 #include "qpid/Exception.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Runnable.h"
@@ -83,6 +84,8 @@ class Channel : private sys::Runnable
     SessionCore::shared_ptr sessionCore;
     framing::ChannelId channelId;
     BlockingQueue<ReceivedContent::shared_ptr> gets;
+    framing::Uuid uniqueId;
+    uint32_t nameCounter;
 
     void stop();
 
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index e41ab363b5..e309b5c63e 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -26,7 +26,7 @@
 #include "qpid/QpidError.h"
 #include "ClientChannel.h"
 #include "ConnectionImpl.h"
-#include "Session.h"
+#include "qpid/client/Session.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
 
 
diff --git a/cpp/src/qpid/client/ExecutionHandler.cpp b/cpp/src/qpid/client/ExecutionHandler.cpp
index 6ee6429b6b..6c2600d00b 100644
--- a/cpp/src/qpid/client/ExecutionHandler.cpp
+++ b/cpp/src/qpid/client/ExecutionHandler.cpp
@@ -78,7 +78,7 @@ void ExecutionHandler::handle(AMQFrame& frame)
     }
 }
 
-void ExecutionHandler::complete(uint32_t cumulative, SequenceNumberSet range)
+void ExecutionHandler::complete(uint32_t cumulative, const SequenceNumberSet& range)
 {
     SequenceNumber mark(cumulative);
     if (outgoing.lwm < mark) {
@@ -101,6 +101,26 @@ void ExecutionHandler::flush()
     incoming.lwm = incoming.hwm;
 }
 
+void ExecutionHandler::noop()
+{
+    //do nothing
+}
+
+void ExecutionHandler::result(uint32_t /*command*/, const std::string& /*data*/)
+{
+    //TODO: need to signal the result to the appropriate listener
+}
+
+void ExecutionHandler::sync()
+{
+    //TODO: implement (the application is in charge of completion of
+    //some commands, so need to track completion for them).
+
+    //This shouldn't ever need to be called by the server (in my
+    //opinion) as the server never needs to synchronise with the
+    //clients execution
+}
+
 void ExecutionHandler::sendFlush()
 {
     AMQFrame frame(version, 0, ExecutionFlushBody());
diff --git a/cpp/src/qpid/client/ExecutionHandler.h b/cpp/src/qpid/client/ExecutionHandler.h
index 21613df779..b409d5df7b 100644
--- a/cpp/src/qpid/client/ExecutionHandler.h
+++ b/cpp/src/qpid/client/ExecutionHandler.h
@@ -45,8 +45,11 @@ class ExecutionHandler :
     framing::ProtocolVersion version;
     uint64_t maxFrameSize;
 
-    void complete(uint32_t mark, framing::SequenceNumberSet range);    
+    void complete(uint32_t mark, const framing::SequenceNumberSet& range);    
     void flush();
+    void noop();
+    void result(uint32_t command, const std::string& data);
+    void sync();
 
 public:
     BlockingQueue<ReceivedContent::shared_ptr> received; 
diff --git a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/cpp/src/qpid/framing/AMQP_HighestVersion.h
index a3932d7cb5..42139c7937 100644
--- a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/cpp/src/qpid/framing/AMQP_HighestVersion.h
@@ -1,4 +1,3 @@
-&{AMQP_HighestVersion.h}
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +20,8 @@
  */
 
 /*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
+ * This file used to be auto-generated by Qpid Gentools v.0.1
+ * its here temporarily until we get a full solution to multi-version support
  */
 #ifndef qpid_framing_highestProtocolVersion__
 #define qpid_framing_highestProtocolVersion__
@@ -34,7 +32,7 @@
 namespace qpid {
 namespace framing {
 
-static ProtocolVersion highestProtocolVersion(${hv_latest_major}, ${hv_latest_minor});
+static ProtocolVersion highestProtocolVersion(0, 10);
 
 } /* namespace framing */
 } /* namespace qpid */
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/cpp/src/qpid/framing/StructHelper.h
index a61b2b762d..b5d1b1e78c 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/cpp/src/qpid/framing/StructHelper.h
@@ -1,4 +1,3 @@
-&{AMQP_ClientOperations.h}
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,46 +18,39 @@
  * under the License.
  *
  */
+#ifndef _StructHelper_
+#define _StructHelper_
 
-/*
- * This file is auto-generated by ${GENERATOR} - do not modify.
- * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
- */
-
-#ifndef qpid_framing_AMQP_ClientOperations__
-#define qpid_framing_AMQP_ClientOperations__
-
-#include <sstream>
-
-#include "qpid/framing/ProtocolVersion.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace framing {
 
-class AMQMethodBody;
-
-class AMQP_ClientOperations
+class StructHelper
 {
 public:
-    virtual ~AMQP_ClientOperations() {}
-
-    virtual ProtocolVersion getVersion() const = 0;
-
-    // Include framing constant declarations
-    #include "AMQP_Constants.h"
-
-    // Inner classes
-
-%{CLIST} ${coh_inner_class}
-	
-    // Method handler get methods
-
-%{CLIST} ${coh_method_handler_get_method}
-
-}; /* class AMQP_ClientOperations */
-
-} /* namespace framing */
-} /* namespace qpid */
 
-#endif
+    template <class T> void encode(const T t, std::string& data) {
+        uint32_t size = t.size() + 2/*type*/;
+        Buffer buffer(size);
+        buffer.putShort(T::TYPE);
+        t.encode(buffer);
+        buffer.flip();
+        buffer.getRawData(data, size);        
+    }
+
+    template <class T> void decode(T t, std::string& data) {
+        Buffer buffer(data.length());
+        buffer.putRawData(data);        
+        buffer.flip();
+        uint16_t type = buffer.getShort();
+        if (type == T::TYPE) {
+            t.decode(buffer);
+        } else {
+            throw Exception("Type code does not match");
+        }
+    }
+};
+
+}}
+#endif  
diff --git a/cpp/src/qpid/framing/amqp_types_full.h b/cpp/src/qpid/framing/amqp_types_full.h
index 6a24a99d38..027b563caf 100644
--- a/cpp/src/qpid/framing/amqp_types_full.h
+++ b/cpp/src/qpid/framing/amqp_types_full.h
@@ -32,5 +32,6 @@
 #include "amqp_types.h"
 #include "FramingContent.h"
 #include "FieldTable.h"
+#include "SequenceNumberSet.h"
 
 #endif  /*!_framing_amqp_types_decl_h*/
diff --git a/cpp/src/tests/Blob b/cpp/src/tests/Blob
deleted file mode 100755
index 05e67dc01f..0000000000
--- a/cpp/src/tests/Blob
+++ /dev/null
diff --git a/cpp/src/tests/Cluster_child.cpp b/cpp/src/tests/Cluster_child.cpp
index 62ccb9bd72..7789ada614 100644
--- a/cpp/src/tests/Cluster_child.cpp
+++ b/cpp/src/tests/Cluster_child.cpp
@@ -32,7 +32,7 @@ using namespace qpid::log;
 
 static const ProtocolVersion VER;
 
-/** Chlid part of Cluster::clusterTwo test */
+/** Child part of Cluster::clusterTwo test */
 void clusterTwo() {
     TestCluster cluster("clusterTwo", "amqp:child:2");
     AMQFrame frame;
diff --git a/python/qpid/peer.py b/python/qpid/peer.py
index 6762f774f4..6ad5482f09 100644
--- a/python/qpid/peer.py
+++ b/python/qpid/peer.py
@@ -208,6 +208,8 @@ class Channel:
     self.responses.close()
     self.completion.close()
     self.incoming_completion.reset()
+    for f in self.futures.values():
+      f.put_response(self, reason)
 
   def write(self, frame, content = None):
     if self.closed:
@@ -324,7 +326,10 @@ class Channel:
           raise ValueError(resp)
       elif frame.method.result:
         if self.synchronous:
-          return future.get_response(timeout=10)
+          fr = future.get_response(timeout=10)
+          if self.closed:
+            raise Closed(self.reason)
+          return fr
         else:
           return future
       elif self.synchronous and not frame.method.response \
@@ -373,7 +378,10 @@ class Future:
 
   def get_response(self, timeout=None):
     self.completed.wait(timeout)
-    return self.response
+    if self.completed.isSet():
+      return self.response
+    else:
+      return None
 
   def is_complete(self):
     return self.completed.isSet()
diff --git a/python/qpid/testlib.py b/python/qpid/testlib.py
index 8a3abf840b..6820ae3bae 100644
--- a/python/qpid/testlib.py
+++ b/python/qpid/testlib.py
@@ -228,7 +228,7 @@ class TestBase(unittest.TestCase):
     def queue_declare(self, channel=None, *args, **keys):
         channel = channel or self.channel
         reply = channel.queue_declare(*args, **keys)
-        self.queues.append((channel, reply.queue))
+        self.queues.append((channel, keys["queue"]))
         return reply
 
     def exchange_declare(self, channel=None, ticket=0, exchange='',
@@ -254,7 +254,7 @@ class TestBase(unittest.TestCase):
             if not "uniqueTag" in dir(self): self.uniqueTag = 1
             else: self.uniqueTag += 1
             consumer_tag = "tag" + str(self.uniqueTag)
-            self.channel.message_consume(queue=queueName, destination=consumer_tag, no_ack=True)
+            self.channel.message_subscribe(queue=queueName, destination=consumer_tag)
             return self.client.queue(consumer_tag)
 
     def assertEmpty(self, queue):
diff --git a/python/tests_0-10/alternate-exchange.py b/python/tests_0-10/alternate-exchange.py
index 19405a1c9f..a1c6151fca 100644
--- a/python/tests_0-10/alternate-exchange.py
+++ b/python/tests_0-10/alternate-exchange.py
@@ -39,13 +39,13 @@ class AlternateExchangeTests(TestBase):
         #declare, bind (to the alternate exchange) and consume from a queue for 'returned' messages
         channel.queue_declare(queue="returns", exclusive=True)
         channel.queue_bind(queue="returns", exchange="secondary")
-        channel.message_consume(destination="a", queue="returns")
+        channel.message_subscribe(destination="a", queue="returns")
         returned = self.client.queue("a")
 
         #declare, bind (to the primary exchange) and consume from a queue for 'processed' messages
         channel.queue_declare(queue="processed", exclusive=True)
         channel.queue_bind(queue="processed", exchange="primary", routing_key="my-key")
-        channel.message_consume(destination="b", queue="processed")
+        channel.message_subscribe(destination="b", queue="processed")
         processed = self.client.queue("b")
 
         #publish to the primary exchange
@@ -73,7 +73,7 @@ class AlternateExchangeTests(TestBase):
         channel.exchange_declare(exchange="dlq", type="fanout")
         channel.queue_declare(queue="deleted", exclusive=True)
         channel.queue_bind(exchange="dlq", queue="deleted")
-        channel.message_consume(destination="dlq", queue="deleted")
+        channel.message_subscribe(destination="dlq", queue="deleted")
         dlq = self.client.queue("dlq")
 
         #create a queue using the dlq as its alternate exchange:
@@ -103,7 +103,7 @@ class AlternateExchangeTests(TestBase):
         channel.exchange_declare(exchange="dlq", type="fanout")
         channel.queue_declare(queue="immediate", exclusive=True)
         channel.queue_bind(exchange="dlq", queue="immediate")
-        channel.message_consume(destination="dlq", queue="immediate")
+        channel.message_subscribe(destination="dlq", queue="immediate")
         dlq = self.client.queue("dlq")
 
         #create a queue using the dlq as its alternate exchange:
diff --git a/python/tests_0-10/broker.py b/python/tests_0-10/broker.py
index 6bc2f7ceb8..647f5d4fa5 100644
--- a/python/tests_0-10/broker.py
+++ b/python/tests_0-10/broker.py
@@ -35,7 +35,7 @@ class BrokerTests(TestBase):
 
         # No ack consumer
         ctag = "tag1"
-        ch.message_consume(queue = "myqueue", destination = ctag, no_ack = True)
+        ch.message_subscribe(queue = "myqueue", destination = ctag, confirm_mode = 0)
         body = "test no-ack"
         ch.message_transfer(routing_key = "myqueue", body = body)
         msg = self.client.queue(ctag).get(timeout = 5)
@@ -44,7 +44,7 @@ class BrokerTests(TestBase):
         # Acknowledging consumer
         self.queue_declare(ch, queue = "otherqueue")
         ctag = "tag2"
-        ch.message_consume(queue = "otherqueue", destination = ctag, no_ack = False)
+        ch.message_subscribe(queue = "otherqueue", destination = ctag, confirm_mode = 1)
         body = "test ack"
         ch.message_transfer(routing_key = "otherqueue", body = body)
         msg = self.client.queue(ctag).get(timeout = 5)
@@ -60,7 +60,7 @@ class BrokerTests(TestBase):
         self.queue_declare(channel, queue="test-queue") 
         channel.queue_bind(queue="test-queue", exchange="test-exchange", routing_key="key")
         consumer_tag = "tag1"
-        channel.message_consume(queue="test-queue", destination=consumer_tag, no_ack=True)
+        channel.message_subscribe(queue="test-queue", destination=consumer_tag, confirm_mode = 0)
         queue = self.client.queue(consumer_tag)
 
         body = "Immediate Delivery"
@@ -84,7 +84,7 @@ class BrokerTests(TestBase):
         channel.message_transfer(destination="test-exchange", routing_key="key", body=body)
 
         consumer_tag = "tag1"
-        channel.message_consume(queue="test-queue", destination=consumer_tag, no_ack=True)
+        channel.message_subscribe(queue="test-queue", destination=consumer_tag, confirm_mode = 0)
         queue = self.client.queue(consumer_tag)
         msg = queue.get(timeout=5)
         self.assert_(msg.body == body)
@@ -111,7 +111,7 @@ class BrokerTests(TestBase):
     def test_channel_flow(self):
         channel = self.channel
         channel.queue_declare(queue="flow_test_queue", exclusive=True)
-        channel.message_consume(destination="my-tag", queue="flow_test_queue")
+        channel.message_subscribe(destination="my-tag", queue="flow_test_queue")
         incoming = self.client.queue("my-tag")
         
         channel.channel_flow(active=False)        
diff --git a/python/tests_0-10/dtx.py b/python/tests_0-10/dtx.py
index 2835d703ae..a5b53ac65b 100644
--- a/python/tests_0-10/dtx.py
+++ b/python/tests_0-10/dtx.py
@@ -366,7 +366,7 @@ class DtxTests(TestBase):
 
         #check the second message is available, but not the first
         self.assertMessageCount(1, "tx-queue")
-        channel.message_consume(queue="tx-queue", destination="results", no_ack=False)
+        channel.message_subscribe(queue="tx-queue", destination="results", confirm_mode=1)
         msg = self.client.queue("results").get(timeout=1)
         self.assertEqual("two", msg.message_id)
         channel.message_cancel(destination="results")
@@ -597,9 +597,9 @@ class DtxTests(TestBase):
         channel.message_transfer(routing_key=dest, message_id=msg.message_id, body=msg.body)        
 
     def assertMessageCount(self, expected, queue):
-        self.assertEqual(expected, self.channel.queue_declare(queue=queue, passive=True).message_count)
+        self.assertEqual(expected, self.channel.queue_query(queue=queue).message_count)
 
     def assertMessageId(self, expected, queue):
-        self.channel.message_consume(queue=queue, destination="results", no_ack=True)
+        self.channel.message_subscribe(queue=queue, destination="results")
         self.assertEqual(expected, self.client.queue("results").get(timeout=1).message_id)
         self.channel.message_cancel(destination="results")
diff --git a/python/tests_0-10/example.py b/python/tests_0-10/example.py
index dc71b0590b..e4c80951ac 100644
--- a/python/tests_0-10/example.py
+++ b/python/tests_0-10/example.py
@@ -68,7 +68,7 @@ class ExampleTest (TestBase):
         # has fields corresponding to the reply method fields, plus a content
         # field that is filled if the reply includes content. In this case the
         # interesting field is the consumer_tag.
-        channel.message_consume(queue="test-queue", destination="consumer_tag")
+        channel.message_subscribe(queue="test-queue", destination="consumer_tag")
 
         # We can use the Client.queue(...) method to access the queue
         # corresponding to our consumer_tag.
diff --git a/python/tests_0-10/message.py b/python/tests_0-10/message.py
index b882cd5438..6cf2f3ef89 100644
--- a/python/tests_0-10/message.py
+++ b/python/tests_0-10/message.py
@@ -34,8 +34,8 @@ class MessageTests(TestBase):
         channel.queue_declare(queue="test-queue-1a", exclusive=True)
         channel.queue_declare(queue="test-queue-1b", exclusive=True)
         #establish two consumers one of which excludes delivery of locally sent messages
-        channel.message_consume(destination="local_included", queue="test-queue-1a")
-        channel.message_consume(destination="local_excluded", queue="test-queue-1b", no_local=True)
+        channel.message_subscribe(destination="local_included", queue="test-queue-1a")
+        channel.message_subscribe(destination="local_excluded", queue="test-queue-1b", no_local=True)
 
         #send a message
         channel.message_transfer(routing_key="test-queue-1a", body="consume_no_local")
@@ -61,9 +61,9 @@ class MessageTests(TestBase):
         channel.queue_declare(queue="test-queue-2", exclusive=True)
 
         #check that an exclusive consumer prevents other consumer being created:
-        channel.message_consume(destination="first", queue="test-queue-2", exclusive=True)
+        channel.message_subscribe(destination="first", queue="test-queue-2", exclusive=True)
         try:
-            channel.message_consume(destination="second", queue="test-queue-2")
+            channel.message_subscribe(destination="second", queue="test-queue-2")
             self.fail("Expected consume request to fail due to previous exclusive consumer")
         except Closed, e:
             self.assertChannelException(403, e.args[0])
@@ -73,9 +73,9 @@ class MessageTests(TestBase):
         channel.channel_open()
 
         #check that an exclusive consumer cannot be created if a consumer already exists:
-        channel.message_consume(destination="first", queue="test-queue-2")
+        channel.message_subscribe(destination="first", queue="test-queue-2")
         try:
-            channel.message_consume(destination="second", queue="test-queue-2", exclusive=True)
+            channel.message_subscribe(destination="second", queue="test-queue-2", exclusive=True)
             self.fail("Expected exclusive consume request to fail due to previous consumer")
         except Closed, e:
             self.assertChannelException(403, e.args[0])
@@ -87,7 +87,7 @@ class MessageTests(TestBase):
         channel = self.channel
         try:
             #queue specified but doesn't exist:
-            channel.message_consume(queue="invalid-queue")
+            channel.message_subscribe(queue="invalid-queue")
             self.fail("Expected failure when consuming from non-existent queue")
         except Closed, e:
             self.assertChannelException(404, e.args[0])
@@ -96,7 +96,7 @@ class MessageTests(TestBase):
         channel.channel_open()
         try:
             #queue not specified and none previously declared for channel:
-            channel.message_consume(queue="")
+            channel.message_subscribe(queue="")
             self.fail("Expected failure when consuming from unspecified queue")
         except Closed, e:
             self.assertConnectionException(530, e.args[0])
@@ -110,9 +110,9 @@ class MessageTests(TestBase):
         channel.queue_declare(queue="test-queue-3", exclusive=True)
 
         #check that attempts to use duplicate tags are detected and prevented:
-        channel.message_consume(destination="first", queue="test-queue-3")
+        channel.message_subscribe(destination="first", queue="test-queue-3")
         try:
-            channel.message_consume(destination="first", queue="test-queue-3")
+            channel.message_subscribe(destination="first", queue="test-queue-3")
             self.fail("Expected consume request to fail due to non-unique tag")
         except Closed, e:
             self.assertConnectionException(530, e.args[0])
@@ -124,7 +124,7 @@ class MessageTests(TestBase):
         channel = self.channel
         #setup, declare a queue:
         channel.queue_declare(queue="test-queue-4", exclusive=True)
-        channel.message_consume(destination="my-consumer", queue="test-queue-4")
+        channel.message_subscribe(destination="my-consumer", queue="test-queue-4")
         channel.message_transfer(routing_key="test-queue-4", body="One")
 
         #cancel should stop messages being delivered
@@ -150,7 +150,7 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue="test-ack-queue", exclusive=True)
         
-        channel.message_consume(queue="test-ack-queue", destination="consumer_tag", no_ack=False)
+        channel.message_subscribe(queue="test-ack-queue", destination="consumer_tag", confirm_mode=1)
         queue = self.client.queue("consumer_tag")
 
         channel.message_transfer(routing_key="test-ack-queue", body="One")
@@ -194,7 +194,7 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue="test-requeue", exclusive=True)
         
-        channel.message_consume(queue="test-requeue", destination="consumer_tag", no_ack=False)
+        channel.message_subscribe(queue="test-requeue", destination="consumer_tag", confirm_mode=1)
         queue = self.client.queue("consumer_tag")
 
         channel.message_transfer(routing_key="test-requeue", body="One")
@@ -225,7 +225,7 @@ class MessageTests(TestBase):
         #requeue unacked messages (Three and Five)
         channel.message_recover(requeue=True)
 
-        channel.message_consume(queue="test-requeue", destination="consumer_tag")
+        channel.message_subscribe(queue="test-requeue", destination="consumer_tag")
         queue2 = self.client.queue("consumer_tag")
         
         msg3b = queue2.get(timeout=1)
@@ -256,7 +256,7 @@ class MessageTests(TestBase):
         #setup: declare queue and subscribe
         channel = self.channel
         channel.queue_declare(queue="test-prefetch-count", exclusive=True)
-        subscription = channel.message_consume(queue="test-prefetch-count", destination="consumer_tag", no_ack=False)
+        subscription = channel.message_subscribe(queue="test-prefetch-count", destination="consumer_tag", confirm_mode=1)
         queue = self.client.queue("consumer_tag")
 
         #set prefetch to 5:
@@ -298,7 +298,7 @@ class MessageTests(TestBase):
         #setup: declare queue and subscribe
         channel = self.channel
         channel.queue_declare(queue="test-prefetch-size", exclusive=True)
-        subscription = channel.message_consume(queue="test-prefetch-size", destination="consumer_tag", no_ack=False)
+        subscription = channel.message_subscribe(queue="test-prefetch-size", destination="consumer_tag", confirm_mode=1)
         queue = self.client.queue("consumer_tag")
 
         #set prefetch to 50 bytes (each message is 9 or 10 bytes):
@@ -362,13 +362,13 @@ class MessageTests(TestBase):
         self.assertEqual(reply.method.klass.name, "message")
         self.assertEqual(reply.method.name, "empty")
 
-        #repeat for no_ack=False
+        #repeat for confirm_mode=1
         for i in range(11, 21):
             channel.message_transfer(routing_key="test-get", body="Message %d" % i)
 
         for i in range(11, 21):
             tag = "queue %d" % i
-            reply = channel.message_get(no_ack=False, queue="test-get", destination=tag)
+            reply = channel.message_get(confirm_mode=1, queue="test-get", destination=tag)
             self.assertEqual(reply.method.klass.name, "message")
             self.assertEqual(reply.method.name, "ok")
             msg = self.client.queue(tag).get(timeout=1)
@@ -389,7 +389,7 @@ class MessageTests(TestBase):
         #get the unacked messages again (14, 16, 18, 20)
         for i in [14, 16, 18, 20]:
             tag = "queue %d" % i
-            reply = channel.message_get(no_ack=False, queue="test-get", destination=tag)
+            reply = channel.message_get(confirm_mode=1, queue="test-get", destination=tag)
             self.assertEqual(reply.method.klass.name, "message")
             self.assertEqual(reply.method.name, "ok")
             msg = self.client.queue(tag).get(timeout=1)
@@ -412,7 +412,7 @@ class MessageTests(TestBase):
         """
         channel = self.channel
         channel.queue_declare(queue="ref_queue", exclusive=True)
-        channel.message_consume(queue="ref_queue", destination="c1")
+        channel.message_subscribe(queue="ref_queue", destination="c1")
         queue = self.client.queue("c1")
 
         refId = "myref"
@@ -454,7 +454,7 @@ class MessageTests(TestBase):
         other = self.connect(tune_params={"channel_max":10, "frame_max":5120, "heartbeat":0})
         ch2 = other.channel(1)
         ch2.channel_open()
-        ch2.message_consume(queue="ref_queue", destination="c1")
+        ch2.message_subscribe(queue="ref_queue", destination="c1")
         queue = other.queue("c1")
         
         msg = queue.get(timeout=1)
@@ -469,7 +469,7 @@ class MessageTests(TestBase):
         """
         channel = self.channel
         channel.queue_declare(queue="ref_queue", exclusive=True)
-        channel.message_consume(queue="ref_queue", destination="c1")
+        channel.message_subscribe(queue="ref_queue", destination="c1")
         queue = self.client.queue("c1")
 
         refId = "myref"
@@ -502,8 +502,8 @@ class MessageTests(TestBase):
         #declare and consume from two queues
         channel.queue_declare(queue="q-one", exclusive=True)
         channel.queue_declare(queue="q-two", exclusive=True)
-        channel.message_consume(queue="q-one", destination="q-one")
-        channel.message_consume(queue="q-two", destination="q-two")
+        channel.message_subscribe(queue="q-one", destination="q-one")
+        channel.message_subscribe(queue="q-two", destination="q-two")
         queue1 = self.client.queue("q-one")
         queue2 = self.client.queue("q-two")
 
@@ -590,7 +590,7 @@ class MessageTests(TestBase):
     def test_empty_reference(self):
         channel = self.channel
         channel.queue_declare(queue="ref_queue", exclusive=True)
-        channel.message_consume(queue="ref_queue", destination="c1")
+        channel.message_subscribe(queue="ref_queue", destination="c1")
         queue = self.client.queue("c1")
 
         refId = "myref"
@@ -611,14 +611,14 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue = "q", exclusive=True)
 
-        channel.message_consume(queue = "q", destination = "consumer")
+        channel.message_subscribe(queue = "q", destination = "consumer")
         channel.message_transfer(routing_key = "q", body="blah, blah")
         msg = self.client.queue("consumer").get(timeout = 1)
         self.assertEquals(msg.body, "blah, blah")
         channel.message_cancel(destination = "consumer")
         msg.reject()
 
-        channel.message_consume(queue = "q", destination = "checker")
+        channel.message_subscribe(queue = "q", destination = "checker")
         msg = self.client.queue("checker").get(timeout = 1)
         self.assertEquals(msg.body, "blah, blah")
 
@@ -634,7 +634,7 @@ class MessageTests(TestBase):
 
         channel = self.client.channel(2)
         channel.channel_open()
-        channel.message_consume(queue = "q", destination = "consumer")
+        channel.message_subscribe(queue = "q", destination = "consumer")
         offset = channel.message_resume(reference="my-ref", identifier="my-checkpoint").value
         self.assertTrue(offset<=16)
         channel.message_append(reference="my-ref", bytes="qrstuvwxyz")
@@ -654,7 +654,7 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue = "q", exclusive=True)
         #create consumer (for now that defaults to infinite credit)
-        channel.message_consume(queue = "q", destination = "c")
+        channel.message_subscribe(queue = "q", destination = "c")
         channel.message_flow_mode(mode = 0, destination = "c")
         #set credit to zero (can remove this once move to proper default for subscribe method)
         channel.message_stop(destination = "c")
@@ -686,7 +686,7 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue = "q", exclusive=True)
         #create consumer (for now that defaults to infinite credit)
-        channel.message_consume(queue = "q", destination = "c")
+        channel.message_subscribe(queue = "q", destination = "c")
         channel.message_flow_mode(mode = 0, destination = "c")
         #set credit to zero (can remove this once move to proper default for subscribe method)
         channel.message_stop(destination = "c")
@@ -720,7 +720,7 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue = "q", exclusive=True)
         #create consumer (for now that defaults to infinite credit)
-        channel.message_consume(queue = "q", destination = "c")
+        channel.message_subscribe(queue = "q", destination = "c", confirm_mode = 1)
         channel.message_flow_mode(mode = 1, destination = "c")
         #set credit to zero (can remove this once move to proper default for subscribe method)
         channel.message_stop(destination = "c")
@@ -754,7 +754,7 @@ class MessageTests(TestBase):
         channel = self.channel
         channel.queue_declare(queue = "q", exclusive=True)
         #create consumer (for now that defaults to infinite credit)
-        channel.message_consume(queue = "q", destination = "c")
+        channel.message_subscribe(queue = "q", destination = "c", confirm_mode = 1)
         channel.message_flow_mode(mode = 1, destination = "c")
         #set credit to zero (can remove this once move to proper default for subscribe method)
         channel.message_stop(destination = "c")
diff --git a/python/tests_0-10/query.py b/python/tests_0-10/query.py
index c2e08c003c..06f33be85b 100644
--- a/python/tests_0-10/query.py
+++ b/python/tests_0-10/query.py
@@ -30,16 +30,16 @@ class QueryTests(TestBase):
         """
         channel = self.channel
         #check returned type for the standard exchanges
-        self.assertEqual("direct", channel.exchange_query(name="amq.direct").type)
-        self.assertEqual("topic", channel.exchange_query(name="amq.topic").type)
-        self.assertEqual("fanout", channel.exchange_query(name="amq.fanout").type)
-        self.assertEqual("headers", channel.exchange_query(name="amq.match").type)
-        self.assertEqual("direct", channel.exchange_query(name="").type)        
+        self.assert_type("direct", channel.exchange_query(name="amq.direct"))
+        self.assert_type("topic", channel.exchange_query(name="amq.topic"))
+        self.assert_type("fanout", channel.exchange_query(name="amq.fanout"))
+        self.assert_type("headers", channel.exchange_query(name="amq.match"))
+        self.assert_type("direct", channel.exchange_query(name=""))        
         #declare an exchange
         channel.exchange_declare(exchange="my-test-exchange", type= "direct", durable=False)
         #check that the result of a query is as expected
         response = channel.exchange_query(name="my-test-exchange")
-        self.assertEqual("direct", response.type)
+        self.assert_type("direct", response)
         self.assertEqual(False, response.durable)
         self.assertEqual(False, response.not_found)
         #delete the exchange
@@ -47,6 +47,9 @@ class QueryTests(TestBase):
         #check that the query now reports not-found
         self.assertEqual(True, channel.exchange_query(name="my-test-exchange").not_found)
 
+    def assert_type(self, expected_type, response):
+        self.assertEqual(expected_type, response.__getattr__("type"))
+
     def test_binding_query_direct(self):
         """
         Test that the binding_query method works as expected with the direct exchange
diff --git a/python/tests_0-10/queue.py b/python/tests_0-10/queue.py
index e7fe0b3ed4..8d99c50d32 100644
--- a/python/tests_0-10/queue.py
+++ b/python/tests_0-10/queue.py
@@ -38,18 +38,18 @@ class QueueTests(TestBase):
         channel.message_transfer(destination="test-exchange", routing_key="key", body="three")
 
         #check that the queue now reports 3 messages:
-        reply = channel.queue_declare(queue="test-queue")
+        channel.queue_declare(queue="test-queue")
+        reply = channel.queue_query(queue="test-queue")
         self.assertEqual(3, reply.message_count)
 
         #now do the purge, then test that three messages are purged and the count drops to 0
-        reply = channel.queue_purge(queue="test-queue");
-        self.assertEqual(3, reply.message_count)        
-        reply = channel.queue_declare(queue="test-queue")
-        self.assertEqual(0, reply.message_count)
+        channel.queue_purge(queue="test-queue");
+        reply = channel.queue_query(queue="test-queue")
+        self.assertEqual(0, reply.message_count)        
 
         #send a further message and consume it, ensuring that the other messages are really gone
         channel.message_transfer(destination="test-exchange", routing_key="key", body="four")
-        channel.message_consume(queue="test-queue", destination="tag", no_ack=True)
+        channel.message_subscribe(queue="test-queue", destination="tag")
         queue = self.client.queue("tag")
         msg = queue.get(timeout=1)
         self.assertEqual("four", msg.body)
@@ -169,8 +169,8 @@ class QueueTests(TestBase):
         channel.queue_declare(queue="queue-1", exclusive="True")
         channel.queue_declare(queue="queue-2", exclusive="True")
 
-        channel.message_consume(queue="queue-1", destination="queue-1", no_ack=True)
-        channel.message_consume(queue="queue-2", destination="queue-2", no_ack=True)
+        channel.message_subscribe(queue="queue-1", destination="queue-1")
+        channel.message_subscribe(queue="queue-2", destination="queue-2")
 
         queue1 = self.client.queue("queue-1")
         queue2 = self.client.queue("queue-2")
@@ -213,8 +213,7 @@ class QueueTests(TestBase):
         channel.message_transfer(routing_key="delete-me", body="a")
         channel.message_transfer(routing_key="delete-me", body="b")
         channel.message_transfer(routing_key="delete-me", body="c")        
-        reply = channel.queue_delete(queue="delete-me")
-        self.assertEqual(3, reply.message_count)
+        channel.queue_delete(queue="delete-me")
         #check that it has gone be declaring passively
         try:
             channel.queue_declare(queue="delete-me", passive="True")
@@ -256,7 +255,7 @@ class QueueTests(TestBase):
         channel.channel_open()
 
         #empty queue:
-        channel.message_consume(destination="consumer_tag", queue="delete-me-2", no_ack=True)
+        channel.message_subscribe(destination="consumer_tag", queue="delete-me-2")
         queue = self.client.queue("consumer_tag")
         msg = queue.get(timeout=1)
         self.assertEqual("message", msg.body)
@@ -281,7 +280,7 @@ class QueueTests(TestBase):
         #create a queue and register a consumer:
         channel.queue_declare(queue="delete-me-3")
         channel.queue_declare(queue="delete-me-3", passive="True")
-        channel.message_consume(destination="consumer_tag", queue="delete-me-3", no_ack=True)
+        channel.message_subscribe(destination="consumer_tag", queue="delete-me-3")
 
         #need new channel now:    
         channel2 = self.client.channel(2)
@@ -316,8 +315,8 @@ class QueueTests(TestBase):
         channel.queue_declare(queue="auto-delete-me", auto_delete=True)
 
         #consume from both channels
-        reply = channel.basic_consume(queue="auto-delete-me", no_ack=True)
-        channel2.basic_consume(queue="auto-delete-me", no_ack=True)
+        reply = channel.basic_consume(queue="auto-delete-me")
+        channel2.basic_consume(queue="auto-delete-me")
 
         #implicit cancel
         channel2.channel_close()
diff --git a/python/tests_0-10/tx.py b/python/tests_0-10/tx.py
index b499c2d1f9..4c2f75d35e 100644
--- a/python/tests_0-10/tx.py
+++ b/python/tests_0-10/tx.py
@@ -41,13 +41,13 @@ class TxTests(TestBase):
         channel = self.channel
         channel.tx_select()
 
-        channel.message_consume(queue="tx-commit-a", destination="qa", no_ack=False)
+        channel.message_subscribe(queue="tx-commit-a", destination="qa", confirm_mode=1)
         queue_a = self.client.queue("qa")
 
-        channel.message_consume(queue="tx-commit-b", destination="qb", no_ack=False)
+        channel.message_subscribe(queue="tx-commit-b", destination="qb", confirm_mode=1)
         queue_b = self.client.queue("qb")
 
-        channel.message_consume(queue="tx-commit-c", destination="qc", no_ack=False)
+        channel.message_subscribe(queue="tx-commit-c", destination="qc", confirm_mode=1)
         queue_c = self.client.queue("qc")
 
         #check results
@@ -174,7 +174,7 @@ class TxTests(TestBase):
         channel.tx_select()
 
         #consume and ack messages
-        channel.message_consume(queue=name_a, destination="sub_a", no_ack=False)
+        channel.message_subscribe(queue=name_a, destination="sub_a", confirm_mode=1)
         queue_a = self.client.queue("sub_a")
         for i in range(1, 5):
             msg = queue_a.get(timeout=1)
@@ -182,13 +182,13 @@ class TxTests(TestBase):
 
         msg.complete()
 
-        channel.message_consume(queue=name_b, destination="sub_b", no_ack=False)
+        channel.message_subscribe(queue=name_b, destination="sub_b", confirm_mode=1)
         queue_b = self.client.queue("sub_b")
         msg = queue_b.get(timeout=1)
         self.assertEqual("Message 6", msg.body)
         msg.complete()
 
-        sub_c = channel.message_consume(queue=name_c, destination="sub_c", no_ack=False)
+        sub_c = channel.message_subscribe(queue=name_c, destination="sub_c", confirm_mode=1)
         queue_c = self.client.queue("sub_c")
         msg = queue_c.get(timeout=1)
         self.assertEqual("Message 7", msg.body)
diff --git a/specs/amqp-transitional.0-10.xml b/specs/amqp-transitional.0-10.xml
index 42a784e163..9d31159c39 100644
--- a/specs/amqp-transitional.0-10.xml
+++ b/specs/amqp-transitional.0-10.xml
@@ -130,13 +130,14 @@
 
 -->
 
-<amqp xmlns="http://www.amqp.org/schema/amqp.xsd"
-    major="0" minor="10" port="5672" comment="AMQ Protocol (Working version)">
+<!--
 
-  <!-- Need these for the transition from 0-9 to 0-10, while still on 0-9 framing: -->  
-  <constant name = "frame-request"    value = "9" />
-  <constant name = "frame-response"   value = "10" />
+<!DOCTYPE amqp SYSTEM "amqp.dtd">
 
+-->
+
+<amqp xmlns="http://www.amqp.org/schema/amqp.xsd"
+    major="0" minor="10" port="5672" comment="AMQ Protocol (Working version)">
 
   <!--
     ======================================================
@@ -147,9 +148,6 @@
   <constant name="frame-method" value="1" />
   <constant name="frame-header" value="2" />
   <constant name="frame-body" value="3" />
-  <constant name="frame-oob-method" value="4" />
-  <constant name="frame-oob-header" value="5" />
-  <constant name="frame-oob-body" value="6" />
   <constant name="frame-trace" value="7" />
   <constant name="frame-heartbeat" value="8" />
 
@@ -773,7 +771,11 @@
       <!-- TODO: Description required for docs -->
     </doc>
   </domain>
+
   <domain name="method-id" type="short">
+    <doc>
+      <!-- TODO: Description required for docs -->
+    </doc>
   </domain>
 
   <domain name="consumer-tag" type="shortstr" label="consumer tag">
@@ -991,6 +993,214 @@
     </doc>
   </domain>
 
+  <domain name="reply-to">
+    <struct size="short" pack="short">
+      <field name="exchange-name" domain="exchange-name" />
+      <field name="routing-key" domain="shortstr" />
+    </struct>
+  </domain>
+
+  <domain name="confirm-mode" type="octet" label="indicates a confirmation mode">
+    <doc>
+      Controls whether message transfer needs to be confirmed.
+
+      One of:
+        - off (0): confirmation is not required, once a message has been transferred in pre-acquire
+                   mode (or once acquire has been sent in no-acquire mode) the message is considered
+                   transferred
+
+        - on  (1): an acquired message (whether acquisition was implicit as in pre-acquire mode or
+                   explicit as in no-acquire mode) is not considered transferred until the original
+                   transfer is complete (signaled via execution.complete)
+    </doc>
+  </domain>
+
+  <domain name="acquire-mode" type="octet" label="indicates the transfer mode">
+    <doc>
+      Indicates whether a transferred message can be considered as automatically acquired or whether
+      an explicit request is necessary in order to acquire it.
+
+      One of:
+        - no-acquire  (0): the message must be explicitly acquired
+
+        - pre-acquire (1): the message is acquired when the transfer starts
+    </doc>
+  </domain>
+
+  <!-- message header domains -->
+
+  <domain name="delivery-properties">
+    <struct size="long" pack="short" type="0">
+      <field name="discard-unroutable" domain="bit" label="controls discard of unroutable messages">
+        <doc>
+          If set on a message that is not routable the broker can discard it. If not set unroutable
+          should be handled by reject when confirmation is on or by routing to the
+          alternate-exchange if defined when confirmation is off.
+        </doc>
+      </field>
+
+      <field name="redelivered" domain="redelivered" label="redelivery flag">
+        <doc>
+          This boolean flag indicates that the message has been previously delivered to this or
+          another client.
+        </doc>
+      </field>
+
+      <field name="priority" domain="octet" label="message priority, 0 to 9">
+        <doc>
+          Message priority, which can be between 0 and 9. Messages with higher priorities may be
+          delivered before those with lower priorities.
+        </doc>
+      </field>
+
+      <field name="delivery-mode" domain="octet" label="message persistence">
+        <doc>
+          The delivery mode may be non-persistent (1) or persistent (2). A persistent message is one
+          which must be stored on a persistent medium (usually hard drive) at every stage of
+          delivery so that it will not be lost in event of failure (other than the medium itself).
+          This is normally accomplished with some additional overhead. A persistent message may be
+          delivered more than once if there is uncertainty about the state of its delivery after a
+          failure and recovery.
+
+          Conversely, a non-persistent message may be lost in event of a failure, but the nature of
+          the communication is such that an occasional message loss is tolerable. This is the lowest
+          overhead mode. Non-persistent messages are delivered at most once only.
+        </doc>
+      </field>
+
+      <field name="ttl" domain="duration" label="time to live">
+        <doc>
+          If this is set to a non zero value then a message expiration time will be computed based
+          on the current time plus this value. Messages that live longer than their expiration time
+          will be discarded (or dead lettered).
+        </doc>
+        <rule name="ttl-decrement">
+          <doc>
+            If a message is transferred between brokers before delivery to a final consumer the ttl
+            should be decremented before peer to peer transfer and both timestamp and expiration
+            should be cleared.
+          </doc>
+        </rule>
+      </field>
+
+      <field name="timestamp" domain="timestamp" label="message timestamp">
+        <doc>
+          The timestamp is set by the broker on arrival of the message.
+        </doc>
+      </field>
+
+      <field name="expiration" domain="timestamp" label="message expiration time">
+        <doc>
+          The expiration header assigned by the broker. After receiving the message the broker sets
+          expiration to the sum of the ttl specified in the publish method and the current time.
+          (ttl=expiration - timestamp)
+        </doc>
+      </field>
+
+      <field name="exchange" domain="exchange-name" label="originating exchange">
+        <doc>
+          The exchange name is a client-selected string that identifies the exchange for transfer
+          methods. Exchange names may consist of any mixture of digits, letters, and underscores.
+          Exchange names are scoped by the virtual host.
+        </doc>
+      </field>
+
+      <field name="routing-key" domain="shortstr" label="message routing key">
+        <doc>
+          The value of the key determines to which queue the exchange will send the message. The way
+          in which keys are used to make this routing decision depends on the type of exchange to
+          which the message is sent. For example, a direct exchange will route a message to a queue
+          if that queue is bound to the exchange with an identical key to that of the message.
+        </doc>
+      </field>
+    </struct>
+  </domain>
+
+  <domain name="message-properties">
+    <struct size="long" pack="short" type="1">
+      <field name="content-length" domain="longlong" label="length of content in bytes">
+        <doc>
+          The length of the message content in bytes.
+        </doc>
+      </field>
+
+      <field name="message-id" domain="shortstr" label="application message identifier">
+        <doc>
+          This is a unique identifier for the message that is guaranteed to be unique across
+          multiple instances, sessions and in time. This allows duplicate messages to be detected.
+          This may be a UUID. Note that this is usually set by the server when it first receives a
+          message.
+
+          If a client wishes to identify a message, it should use the correlation-id instead.
+        </doc>
+      </field>
+
+      <field name="correlation-id" domain="shortstr" label="application correlation identifier">
+        <doc>
+          This is a client-specific id that may be used to mark or identify messages between
+          clients. The server ignores this field.
+        </doc>
+      </field>
+
+      <field name="reply-to" domain="reply-to" label="destination to reply to">
+        <doc>
+          The destination of any message that is sent in reply to this message.
+        </doc>
+      </field>
+
+      <field name="content-type" domain="shortstr" label="MIME content type">
+        <doc>
+          The RFC-2046 MIME type for the message content (such as "text/plain"). This is set by the
+          originating client.
+        </doc>
+      </field>
+
+      <field name="content-encoding" domain="shortstr" label="MIME content encoding">
+        <doc>
+          The encoding for character-based message content. This is set by the originating client.
+          Examples include UTF-8 and ISO-8859-16.
+        </doc>
+      </field>
+
+      <field name="type" domain="shortstr" label="message type name">
+        <doc>
+          The JMS message type.
+        </doc>
+      </field>
+
+      <field name="user-id" domain="shortstr" label="creating user id">
+        <doc>
+          The identity of the user responsible for producing the message.
+        </doc>
+      </field>
+
+      <field name="app-id" domain="shortstr" label="creating application id">
+        <doc>
+          The identity of the client application responsible for producing the message.
+        </doc>
+      </field>
+
+      <field name="transaction-id" domain="shortstr" label="distributed transaction id">
+        <doc>
+          An identifier that links this message to a distributed transaction.
+        </doc>
+      </field>
+
+      <field name="security-token" domain="security-token" label="security token">
+        <doc>
+          A security token used for authentication, replay prevention, and encrypted message bodies.
+        </doc>
+      </field>
+
+      <field name="application-headers" domain="table" label="application specific headers table">
+        <doc>
+          This is a collection of user-defined headers or properties which may be set by the
+          producing client and retrieved by the consuming client. Similar to JMS Properties.
+        </doc>
+      </field>
+    </struct>
+  </domain>
+
   <!-- Domians for DTX -->
 
   <domain name="xid" type="longstr" label="Dtx branch identifier">
@@ -1048,6 +1258,35 @@
 
   <domain name="session-id" type="uuid" label="session identifier" />
 
+  <!-- Domains for the execution class -->
+
+  <domain name="correlation" type="rfc1982-long-set">
+    <doc>
+      Identifies a set of commands inside the window of open conversations.
+    </doc>
+  </domain>
+  <domain name="command-id" type="long"/>
+  <domain name="long-struct" type="long-struct">
+    <doc>
+      Any typed struct whose size width is long.
+    </doc>
+  </domain>
+
+  <domain name="execution-header">
+    <doc>
+      The execution header appears on commands after the class and method id, but prior to method
+      arguments.
+    </doc>
+    <struct size="octet" pack="octet">
+      <field name="sync" domain="bit" label="request notification of completion for a specific command">
+        <doc>
+          Indicates that the peer sending the request wants to be notified when this command is
+          completed.
+        </doc>
+      </field>
+    </struct>
+  </domain>
+
   <!-- Elementary domains -->
   <domain name="bit" type="bit" label="single bit" />
   <domain name="octet" type="octet" label="single octet" />
@@ -1077,13 +1316,9 @@
     </doc>
   </domain>
 
-  <!-- == Class: connextion ==================================================================== -->
-
-  <!-- TODO 0.81 - the 'handler' attribute of methods needs to be reviewed, and if no current
-    implementations use it, removed. /PH 2006/07/20
-  -->
+  <!-- == Class: connection ==================================================================== -->
 
-  <class name="connection" handler="connection" index="10" label="work with socket connections">
+  <class name="connection" index="10" label="work with socket connections">
     <doc>
       The connection class provides methods for a client to establish a network connection to a
       server, and for both peers to operate the connection thereafter.
@@ -1107,7 +1342,7 @@
     <chassis name="server" implement="MUST" />
     <chassis name="client" implement="MUST" />
 
-    <!-- - Method: connextion.start  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.start  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="start" synchronous="1" index="10" label="start connection negotiation">
       <doc>
@@ -1213,7 +1448,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.start-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.start-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="start-ok" synchronous="1" index="11"
       label="select security mechanism and locale">
@@ -1281,7 +1516,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.secure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.secure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="secure" synchronous="1" index="20" label="security mechanism challenge">
       <doc>
@@ -1301,7 +1536,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.secure-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.secure-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="secure-ok" synchronous="1" index="21" label="security mechanism response">
       <doc>
@@ -1320,7 +1555,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.tune - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.tune - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="tune" synchronous="1" index="30" label="propose connection tuning parameters">
       <doc>
@@ -1382,7 +1617,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.tune-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.tune-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="tune-ok" synchronous="1" index="31"
       label="negotiate connection tuning parameters">
@@ -1443,7 +1678,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.open - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.open - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="open" synchronous="1" index="40" label="open connection to virtual host">
       <doc>
@@ -1508,7 +1743,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.open-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.open-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="open-ok" synchronous="1" index="41" label="signal that connection is ready">
       <doc>
@@ -1520,7 +1755,7 @@
       <field name="known-hosts" domain="known-hosts" />
     </method>
 
-    <!-- - Method: connextion.redirect - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.redirect - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="redirect" synchronous="1" index="42" label="redirects client to other server">
       <doc>
@@ -1591,7 +1826,7 @@
       </field>
     </method>
 
-    <!-- - Method: connextion.close-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: connection.close-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="close-ok" synchronous="1" index="51" label="confirm a connection close">
       <doc>
@@ -1614,7 +1849,7 @@
 
   <!-- == Class: session ======================================================================= -->
 
-  <class name="session" handler="session" index="20" label="session control methods">
+  <class name="session" index="20" label="session control methods">
     <doc>
       The session class provides methods for a client to establish a session with a server and for
       both peers to operate the session thereafter.
@@ -1891,29 +2126,6 @@
       </field>
     </method>
 
-    <!-- - Method: session.ping  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="ping" index="60" label="[WORK IN PROGRESS] initiates a pong">
-      <doc>
-        [WORK IN PROGRESS] Request that the recipient issue a pong request.
-      </doc>
-
-      <chassis name="server" implement="MUST" />
-      <chassis name="client" implement="MUST" />
-    </method>
-
-    <!-- - Method: session.pong  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="pong" index="70" label="[WORK IN PROGRESS] issued after receiving a ping">
-      <doc>
-        [WORK IN PROGRESS] Issued after a ping request is received. Note that this is a request
-        issued after receiving a ping, not a response to receiving a ping.
-      </doc>
-
-      <chassis name="server" implement="MUST" />
-      <chassis name="client" implement="MUST" />
-    </method>
-
     <!-- - Method: session.suspend - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="suspend" index="90" label="suspend the session">
@@ -1921,7 +2133,7 @@
         Indicates the sending peer wishes to detach from this session, but not necessarily to
         destroy it.
       </doc>
-      
+
       <!-- TODO: Ratify the inclusion of the chassis element in the XML. -->
       <chassis name="server" implement="MAY" />
 
@@ -2014,6 +2226,18 @@
       <chassis name="client" implement="MUST" />
     </method>
 
+    <!-- ping and pong are still used by cluster test -->
+    <method name = "ping" index = "140" label = "ping">
+      <chassis name = "server" implement = "MUST" />
+      <chassis name = "client" implement = "MUST" />
+    </method>
+
+    <method name = "pong" index = "150" label = "pong">
+      <chassis name = "server" implement = "MUST" />
+      <chassis name = "client" implement = "MUST" />
+    </method>
+
+
   </class>
 
   <!-- == Class: access ======================================================================== -->
@@ -2021,7 +2245,7 @@
   <!-- TODO 0.82 - this class must be implemented by two teams before we can consider it matured.
   -->
 
-  <class name="access" handler="connection" index="30" label="work with access tickets">
+  <class name="access" index="30" label="work with access tickets">
     <doc>
       The protocol control access to server resources using access tickets. A client must explicitly
       request access tickets before doing work. An access ticket grants a client the right to use a
@@ -2144,7 +2368,7 @@
 
   <!-- == Class: exchange ====================================================================== -->
 
-  <class name="exchange" handler="channel" index="40" label="work with exchanges">
+  <class name="exchange" index="40" label="work with exchanges">
     <doc>
       Exchanges match and distribute messages across queues. Exchanges can be configured in the
       server or created at runtime.
@@ -2442,14 +2666,11 @@
 
     <method name="query" synchronous="1" index="30" label="request information about an exchange">
       <doc>
-        This method is used to request information on a particular exchange. That information is
-        conveyed by an query-ok method.
+        This method is used to request information on a particular exchange.
       </doc>
 
       <chassis name="server" implement="MUST" />
 
-      <response name="query-ok" />
-
       <field name="ticket" domain="access-ticket">
         <rule name="validity" on-failure="access-refused">
           <doc>
@@ -2465,50 +2686,48 @@
            the default exchange is implied.
         </doc>
       </field>
-    </method>
-
-    <!-- - Method: exchange.query-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-    <method name="query-ok" synchronous="1" index="31" label="return exchange information">
-      <doc>
-        This method is used in response to a query request and conveys information on a particular
-        exchange.
-      </doc>
-
-      <chassis name="client" implement="MUST" />
+      <result>
+        <struct size="long" type="31">
+          <doc>
+            This is sent in response to a query request and conveys information on a particular
+            exchange.
+          </doc>
 
-      <field name="type" domain="shortstr" label="indicate the exchange type">
-        <doc>
-           The type of the exchange. Will be empty if the exchange is not found.
-        </doc>
-      </field>
+          <field name="type" domain="shortstr" label="indicate the exchange type">
+            <doc>
+               The type of the exchange. Will be empty if the exchange is not found.
+            </doc>
+          </field>
 
-      <field name="durable" domain="bit" label="indicate the durability">
-        <doc>
-           The durability of the exchange, i.e. if set the exchange is durable. Will not be set if
-           the exchange is not found.
-        </doc>
-      </field>
+          <field name="durable" domain="bit" label="indicate the durability">
+            <doc>
+               The durability of the exchange, i.e. if set the exchange is durable. Will not be set if
+               the exchange is not found.
+            </doc>
+          </field>
 
-      <field name="not-found" domain="bit" label="indicate an unknown exchange">
-        <doc>
-           If set, the exchange for which information was requested is not known.
-        </doc>
-      </field>
+          <field name="not-found" domain="bit" label="indicate an unknown exchange">
+            <doc>
+               If set, the exchange for which information was requested is not known.
+            </doc>
+          </field>
 
-      <field name="arguments" domain="table" label="other unspecified exchange properties">
-        <doc>
-          A set of properties of the exchange whose syntax and semantics depends on the server
-          implementation. Will be empty if the exchange is not found.
-        </doc>
-      </field>
+          <field name="arguments" domain="table" label="other unspecified exchange properties">
+            <doc>
+              A set of properties of the exchange whose syntax and semantics depends on the server
+              implementation. Will be empty if the exchange is not found.
+            </doc>
+          </field>
+        </struct>
+      </result>
     </method>
 
   </class>
 
   <!-- == Class: queue ========================================================================= -->
 
-  <class name="queue" handler="channel" index="50" label="work with queues">
+  <class name="queue" index="50" label="work with queues">
     <doc>
       Queues store and forward messages. Queues can be configured in the server or created at
       runtime. Queues must be attached to at least one exchange in order to receive messages from
@@ -2516,10 +2735,11 @@
     </doc>
 
     <doc type="grammar">
-      queue = C:DECLARE S:DECLARE-OK
+      queue = C:DECLARE
             / C:BIND
-            / C:PURGE S:PURGE-OK
-            / C:DELETE S:DELETE-OK
+            / C:PURGE
+            / C:DELETE
+            / C:QUERY
             / C:UNBIND
     </doc>
 
@@ -2573,8 +2793,6 @@
 
       <chassis name="server" implement="MUST" />
 
-      <response name="declare-ok" />
-
       <field name="ticket" domain="access-ticket">
         <doc>
           When a client defines a new queue, this belongs to the access realm of the ticket used.
@@ -2594,17 +2812,6 @@
       </field>
 
       <field name="queue" domain="queue-name">
-        <rule name="default-name">
-          <doc>
-            The queue name MAY be empty, in which case the server MUST create a new queue with a
-            unique generated name and return this to the client in the Declare-Ok method.
-          </doc>
-          <doc type="scenario">
-            Client attempts to create several queues with an empty name. The client then verifies
-            that the server-assigned names are unique and different.
-          </doc>
-        </rule>
-
         <rule name="reserved-prefix" on-failure="not-allowed">
           <doc>
             Queue names starting with "amq." are reserved for pre-declared and standardised server
@@ -2662,9 +2869,9 @@
             if not. If the queue does not exist, the server treats this as a failure.
           </doc>
           <doc type="scenario">
-            Client declares an existing queue with the passive option and expects the server to
-            respond with a declare-ok. Client then attempts to declare a non-existent queue with the
-            passive option, and the server must close the channel with the correct reply-code.
+            Client declares an existing queue with the passive option and expects the command to
+            succeed. Client then attempts to declare a non-existent queue with the passive option,
+            and the server must close the channel with the correct reply-code.
           </doc>
         </rule>
       </field>
@@ -2765,14 +2972,6 @@
         </rule>
       </field>
 
-      <field name="nowait" domain="bit" label="do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait for a reply
-          method. If the server could not complete the method it will raise a channel or connection
-          exception.
-        </doc>
-      </field>
-
       <field name="arguments" domain="table" label="arguments for declaration">
         <doc>
           A set of arguments for the declaration. The syntax and semantics of these arguments
@@ -2781,38 +2980,6 @@
       </field>
     </method>
 
-    <!-- - Method: queue.declare-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="declare-ok" synchronous="1" index="11" label="confirms a queue definition">
-      <doc>
-        This method confirms a Declare method and confirms the name of the queue, essential for
-        automatically-named queues.
-      </doc>
-
-      <chassis name="client" implement="MUST" />
-
-      <field name="queue" domain="queue-name">
-        <doc>
-          Reports the name of the queue. If the server generated a queue name, this field contains
-          that name.
-        </doc>
-        <assert check="notnull" />
-      </field>
-
-      <field name="message-count" domain="long" label="number of messages in queue">
-        <doc>
-          Reports the number of messages in the queue, which will be zero for newly-created queues.
-        </doc>
-      </field>
-
-      <field name="consumer-count" domain="long" label="number of consumers">
-        <doc>
-          Reports the number of active consumers for the queue. Note that consumers can suspend
-          activity (Session.Flow) in which case they do not appear in this count.
-        </doc>
-      </field>
-    </method>
-
     <!-- - Method: queue.bind  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="bind" synchronous="1" index="20" label="bind queue to an exchange">
@@ -3085,8 +3252,6 @@
 
       <chassis name="server" implement="MUST" />
 
-      <response name="purge-ok" />
-
       <field name="ticket" domain="access-ticket">
         <rule name="validity" on-failure="access-refused">
           <doc>
@@ -3117,30 +3282,6 @@
           </doc>
         </rule>
       </field>
-
-      <field name="nowait" domain="bit" label="do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait for a reply
-          method. If the server could not complete the method it will raise a channel or connection
-          exception.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - Method: queue.purge-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="purge-ok" synchronous="1" index="31" label="confirms a queue purge">
-      <doc>
-        This method confirms the purge of a queue.
-      </doc>
-
-      <chassis name="client" implement="MUST" />
-
-      <field name="message-count" domain="long" label="number of messages purged">
-        <doc>
-          Reports the number of messages purged.
-        </doc>
-      </field>
     </method>
 
     <!-- - Method: queue.delete  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -3162,8 +3303,6 @@
 
       <chassis name="server" implement="MUST" />
 
-      <response name="delete-ok" />
-
       <field name="ticket" domain="access-ticket">
         <rule name="validity" on-failure="access-refused">
           <doc>
@@ -3218,37 +3357,67 @@
           </doc>
         </rule>
       </field>
-
-      <field name="nowait" domain="bit" label="do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait for a reply
-          method. If the server could not complete the method it will raise a channel or connection
-          exception.
-        </doc>
-      </field>
     </method>
 
-    <!-- - Method: queue.delete-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: queue.query - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-    <method name="delete-ok" synchronous="1" index="41" label="confirm deletion of a queue">
+    <method name="query" synchronous="1" index="60" label="request information about a queue">
       <doc>
-        This method confirms the deletion of a queue.
+        This method requests information about a queue.
       </doc>
 
-      <chassis name="client" implement="MUST" />
+      <chassis name="server" implement="MUST" />
 
-      <field name="message-count" domain="long" label="number of messages purged">
-        <doc>
-          Reports the number of messages purged.
-        </doc>
+
+      <field name="queue" domain="queue-name" label="the queried queue">
+        <assert check="notnull" />
       </field>
+
+      <result>
+        <struct size="long" type="61">
+          <doc>
+            This is sent in response to queue.query, and conveys the requested information about a
+            queue.
+          </doc>
+
+          <field name="queue" domain="queue-name">
+            <doc>
+              Reports the name of the queue.
+            </doc>
+            <assert check="notnull" />
+          </field>
+
+          <field name="alternate-exchange" domain="exchange-name" />
+
+          <field name="durable" domain="bit" />
+
+          <field name="exclusive" domain="bit" />
+
+          <field name="auto-delete" domain="bit" />
+
+          <field name="arguments" domain="table" />
+
+          <field name="message-count" domain="long" label="number of messages in queue">
+            <doc>
+              Reports the number of messages in the queue.
+            </doc>
+          </field>
+
+          <field name="consumer-count" domain="long" label="number of consumers">
+            <doc>
+              Reports the number of active consumers for the queue. Note that consumers can suspend
+              activity (Session.Flow) in which case they do not appear in this count.
+            </doc>
+          </field>
+        </struct>
+      </result>
     </method>
 
   </class>
 
   <!-- == Class: basic ========================================================================= -->
 
-  <class name="basic" handler="channel" index="60" label="[DEPRECATED] work with basic content">
+  <class name="basic" index="60" label="[DEPRECATED] work with basic content">
     <doc>
       [DEPRECATED: replaced by message class.] The Basic class provides methods that support an
       industry-standard messaging model.
@@ -3257,7 +3426,7 @@
     <doc type="grammar">
       basic = C:QOS
             / C:CONSUME S:CONSUME-OK
-            / C:CANCEL S:CANCEL-OK
+            / C:CANCEL 
             / C:PUBLISH content
             / S:RETURN content
             / S:DELIVER content
@@ -3601,7 +3770,7 @@
         [DEPRECATED: Basic replaced by message class.] This method cancels a consumer. This does not
         affect already delivered messages, but it does mean the server will not send any more
         messages for that consumer. The client may receive an arbitrary number of messages in
-        between sending the cancel method and receiving the cancel-ok reply.
+        between sending the cancel method and receiving notification of the completion of the cancel command.
       </doc>
 
       <rule name="non-existent">
@@ -3613,30 +3782,6 @@
 
       <chassis name="server" implement="MUST" />
 
-      <response name="cancel-ok" />
-
-      <field name="consumer-tag" domain="consumer-tag" />
-
-      <field name="nowait" domain="bit" label="do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait for a reply
-          method. If the server could not complete the method it will raise a channel or connection
-          exception.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - Method: basic.cancel-ok - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="cancel-ok" synchronous="1" index="31"
-      label="[DEPRECATED] confirm a cancelled consumer">
-      <doc>
-        [DEPRECATED: Basic replaced by message class.] This method confirms that the cancellation
-        was completed.
-      </doc>
-
-      <chassis name="client" implement="MUST" />
-
       <field name="consumer-tag" domain="consumer-tag" />
     </method>
 
@@ -3703,7 +3848,19 @@
           queue then the broker responds with a basic.reject.
         </doc>
       </field>
-      <field name="immediate" domain="bit" label="request immediate delivery">
+
+      <field name="immediate" domain="bit" label="Request immediate delivery">
+        <doc>
+            If this flag is set, and the resulting message is delivered to a queue with no
+            consumers, the message will not be queued but will instead be routed to the
+            alternate-exchange for that queue. If no such exchange is defined the message will be
+            silently dropped.
+        </doc>
+        <rule name="implementation">
+          <doc>
+            The server SHOULD implement the immediate flag.
+          </doc>
+        </rule>
       </field>
     </method>
 
@@ -3966,7 +4123,7 @@
 
   <!-- == Class: file ========================================================================== -->
 
-  <class name="file" handler="channel" index="70" label="work with file content">
+  <class name="file" index="70" label="work with file content">
     <doc>
       The file class provides methods that support reliable file transfer. File messages have a
       specific set of properties that are required for interoperability with file transfer
@@ -3979,7 +4136,7 @@
     <doc type="grammar">
       file  = C:QOS S:QOS-OK
             / C:CONSUME S:CONSUME-OK
-            / C:CANCEL S:CANCEL-OK
+            / C:CANCEL
             / C:OPEN S:OPEN-OK C:STAGE content
             / S:OPEN C:OPEN-OK S:STAGE content
             / C:PUBLISH
@@ -4212,28 +4369,6 @@
 
       <chassis name="server" implement="MUST" />
 
-      <response name="cancel-ok" />
-
-      <field name="consumer-tag" domain="consumer-tag" />
-
-      <field name="nowait" domain="bit" label="do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait for a reply
-          method. If the server could not complete the method it will raise a channel or connection
-          exception.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - Method: file.cancel-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="cancel-ok" synchronous="1" index="31" label="confirm a cancelled consumer">
-      <doc>
-        This method confirms that the cancellation was completed.
-      </doc>
-
-      <chassis name="client" implement="MUST" />
-
       <field name="consumer-tag" domain="consumer-tag" />
     </method>
 
@@ -4576,7 +4711,7 @@
 
   <!-- == Class: stream ======================================================================== -->
 
-  <class name="stream" handler="channel" index="80" label="work with streaming content">
+  <class name="stream" index="80" label="work with streaming content">
     <doc>
       The stream class provides methods that support multimedia streaming. The stream class uses the
       following semantics: one message is one packet of data; delivery is unacknowledged and
@@ -4587,7 +4722,7 @@
     <doc type="grammar">
       stream  = C:QOS S:QOS-OK
               / C:CONSUME S:CONSUME-OK
-              / C:CANCEL S:CANCEL-OK
+              / C:CANCEL
               / C:PUBLISH content
               / S:RETURN
               / S:DELIVER content
@@ -4826,28 +4961,6 @@
 
       <chassis name="server" implement="MUST" />
 
-      <response name="cancel-ok" />
-
-      <field name="consumer-tag" domain="consumer-tag" />
-
-      <field name="nowait" domain="bit" label="do not send a reply method">
-        <doc>
-          If set, the server will not respond to the method. The client should not wait for a reply
-          method. If the server could not complete the method it will raise a channel or connection
-          exception.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - Method: stream.cancel-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="cancel-ok" synchronous="1" index="31" label="confirm a cancelled consumer">
-      <doc>
-        This method confirms that the cancellation was completed.
-      </doc>
-
-      <chassis name="client" implement="MUST" />
-
       <field name="consumer-tag" domain="consumer-tag" />
     </method>
 
@@ -4994,11 +5107,12 @@
         <assert check="notnull" />
       </field>
     </method>
+
   </class>
 
   <!-- == Class: tx ============================================================================ -->
 
-  <class name="tx" handler="channel" index="90" label="work with standard transactions">
+  <class name="tx" index="90" label="work with standard transactions">
     <doc>
       Standard transactions provide so-called "1.5 phase commit". We can ensure that work is never
       lost, but there is a chance of confirmations being lost, so that messages may be resent.
@@ -5023,7 +5137,7 @@
     <chassis name="server" implement="SHOULD" />
     <chassis name="client" implement="MAY" />
 
-    <!-- - Method: stream.select - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: tx.select - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="select" synchronous="1" index="10" label="select standard transaction mode">
       <doc>
@@ -5033,7 +5147,7 @@
       <chassis name="server" implement="MUST" />
     </method>
 
-    <!-- - Method: stream.commit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: tx.commit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="commit" synchronous="1" index="20" label="commit the current transaction">
       <doc>
@@ -5043,7 +5157,7 @@
       <chassis name="server" implement="MUST" />
     </method>
 
-    <!-- - Method: stream.rollback - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- - Method: tx.rollback - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="rollback" synchronous="1" index="30" label="abandon the current transaction">
       <doc>
@@ -5061,7 +5175,7 @@
     not yet been incorporated here.
   -->
 
-  <class name="dtx-demarcation" handler="channel" index="100" label="Demarcates dtx branches">
+  <class name="dtx-demarcation" index="100" label="Demarcates dtx branches">
     <doc>
       This class is part of the X-Open XA distributed transaction protocol support. It allows a
       session to be selected for use with distributed transactions and the transactional boundaries
@@ -5070,7 +5184,7 @@
 
     <doc type="grammar">
       dtx-demarcation = C:SELECT *demarcation
-      demarcation     = C:START S:START-OK C:END S:END-OK
+      demarcation     = C:START C:END
     </doc>
 
     <rule name="access-control">
@@ -5137,13 +5251,11 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="start-ok" />
-
       <field name="ticket" domain="access-ticket" label="Access-ticket for specific realm">
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -5192,35 +5304,32 @@
 
         <assert check="notnull" />
       </field>
-    </method>
-
-    <!-- - Method: dtx-demarcation.start-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="start-ok" synchronous="1" index="21" label="Confirm dtx start">
-      <doc>
-        This method confirms to the client that the transaction branch is started or specify the
-        error condition.
-      </doc>
 
-      <chassis name="client" implement="MAY" />
+      <result>
+        <struct size="long" type="21">
+          <doc>
+            This confirms to the client that the transaction branch is started or specify the error
+            condition.
+          </doc>
 
-      <field name="status" domain="short" label="Status code">
-        <doc>
-          The value of this field may be one of the following constants:
+          <field name="status" domain="short" label="Status code">
+            <doc>
+              The value of this field may be one of the following constants:
 
-          xa-ok: Normal execution.
+              xa-ok: Normal execution.
 
-          xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
-              reason.
+              xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
+                  reason.
 
-          xa-rbtimeout: The work represented by this transaction branch took too long.
-        </doc>
+              xa-rbtimeout: The work represented by this transaction branch took too long.
+            </doc>
 
-        <assert check="notnull" />
-      </field>
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
-
     <!-- - Method: dtx-demarcation.end - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="end" synchronous="1" index="30" label="End a dtx branch">
@@ -5266,20 +5375,18 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="end-ok" />
-
       <field name="ticket" domain="access-ticket" label="Access-ticket for specific realm">
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
             realms touched by this transaction.
           </doc>
         </rule>
-        
+
         <assert check="notnull" />
       </field>
 
@@ -5308,8 +5415,8 @@
           <doc>
             An implementation MAY elect to roll a transaction back if this failure notification is
             recieved. Should an implementation elect to implement this behaviour, and this bit is
-            set, then then the transaction branch SHOULD be marked as rollback-only and the end-ok
-            response SHOULD have the xa-rbrollback response set.
+            set, then then the transaction branch SHOULD be marked as rollback-only and the end
+            result SHOULD have the xa-rbrollback status set.
           </doc>
         </rule>
 
@@ -5330,33 +5437,31 @@
 
         <assert check="notnull" />
       </field>
-    </method>
-
-    <!-- - Method: dtx-demarcation.end-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="end-ok" synchronous="1" index="31" label="Confirm distributed dtx end">
-      <doc>
-        This method confirms to the client that the transaction branch is ended or specify the error
-        condition.
-      </doc>
 
-      <chassis name="client" implement="MAY" />
+      <result>
+        <struct size="long" type="31">
+          <doc>
+            This method confirms to the client that the transaction branch is ended or specify the
+            error condition.
+          </doc>
 
-      <field name="status" domain="short" label="Status code">
-        <doc>
-          The value of this field may be one of the following constants:
+          <field name="status" domain="short" label="Status code">
+            <doc>
+              The value of this field may be one of the following constants:
 
-          xa-ok: Normal execution.
+              xa-ok: Normal execution.
 
-          xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
-              reason. If an implementation chooses to implement rollback-on-failure behaviour, then
-              this value should be selected if the dtx-demarcation.end.fail bit was set.
+              xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
+                  reason. If an implementation chooses to implement rollback-on-failure behaviour, then
+                  this value should be selected if the dtx-demarcation.end.fail bit was set.
 
-          xa-rbtimeout: The work represented by this transaction branch took too long.
-        </doc>
+              xa-rbtimeout: The work represented by this transaction branch took too long.
+            </doc>
 
-        <assert check="notnull" />
-      </field>
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
   </class>
@@ -5364,7 +5469,7 @@
 
   <!-- == Class: dtx-coordination ============================================================== -->
 
-  <class name="dtx-coordination" handler="channel" index="105" label="Coordinate dtx outcomes">
+  <class name="dtx-coordination" index="105" label="Coordinate dtx outcomes">
     <doc>
       This class is part of the X-Open XA distributed transaction protocol support. It allows the
       transaction manager to coordinate transaction outcomes.
@@ -5376,16 +5481,16 @@
                           / outcome
                           / recovery
       command             = C:SET-TIMEOUT
-                          / C:GET-TIMEOUT S:GET-TIMEOUT-OK
+                          / C:GET-TIMEOUT
       outcome             = one-phase-commit
                           / one-phase-rollback
                           / two-phase-commit
                           / two-phase-rollback
-      one-phase-commit    = C:COMMIT S:COMMIT-OK
-      one-phase-rollback  = C:ROLLBACK S:ROLLBACK-OK
-      two-phase-commit    = C:PREPARE S:PREPARE-OK C:COMMIT S:COMMIT-OK
-      two-phase-rollback  = C:PREPARE S:PREPARE-OK C:ROLLBACK S:ROLLBACK-OK
-      recovery            = C:RECOVER S:RECOVER-OK *recovery-outcome
+      one-phase-commit    = C:COMMIT
+      one-phase-rollback  = C:ROLLBACK
+      two-phase-commit    = C:PREPARE C:COMMIT
+      two-phase-rollback  = C:PREPARE C:ROLLBACK
+      recovery            = C:RECOVER *recovery-outcome
       recovery-outcome    = one-phase-commit
                           / one-phase-rollback
                           / C:FORGET
@@ -5426,13 +5531,11 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="commit-ok" />
-
       <field name="ticket" domain="access-ticket" label="Access-ticket for specific realm">
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -5484,43 +5587,41 @@
 
         <assert check="notnull" />
       </field>
-    </method>
-
-    <!-- - Method: dtx-coordination.commit-ok  - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="commit-ok" synchronous="1" index="11" label="Confirm dtx commit">
-      <doc>
-        This method confirms to the client that the transaction branch is committed or specify the
-        error condition.
-      </doc>
 
-      <chassis name="client" implement="MAY" />
+      <result>
+        <struct size="long" type="11">
+          <doc>
+            This confirms to the client that the transaction branch is committed or specify the
+            error condition.
+          </doc>
 
-      <field name="status" domain="short" label="Status code">
-        <doc>
-          The value of this field may be one of the following constants:
+          <field name="status" domain="short" label="Status code">
+            <doc>
+              The value of this field may be one of the following constants:
 
-          xa-ok: Normal execution
+              xa-ok: Normal execution
 
-          xa-heurhaz: Due to some failure, the work done on behalf of the specified transaction
-              branch may have been heuristically completed.
+              xa-heurhaz: Due to some failure, the work done on behalf of the specified transaction
+                  branch may have been heuristically completed.
 
-          xa-heurcom: Due to a heuristic decision, the work done on behalf of the specified
-              transaction branch was committed.
+              xa-heurcom: Due to a heuristic decision, the work done on behalf of the specified
+                  transaction branch was committed.
 
-          xa-heurrb: Due to a heuristic decision, the work done on behalf of the specified
-              transaction branch was rolled back.
+              xa-heurrb: Due to a heuristic decision, the work done on behalf of the specified
+                  transaction branch was rolled back.
 
-          xa-heurmix: Due to a heuristic decision, the work done on behalf of the specified
-            transaction branch was partially committed and partially rolled back.
+              xa-heurmix: Due to a heuristic decision, the work done on behalf of the specified
+                transaction branch was partially committed and partially rolled back.
 
-          xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
-              reason.
+              xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
+                  reason.
 
-          xa-rbtimeout: The work represented by this transaction branch took too long.
-        </doc>
-        <assert check="notnull" />
-      </field>
+              xa-rbtimeout: The work represented by this transaction branch took too long.
+            </doc>
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
     <!-- - Method: dtx-coordination.forget - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -5550,7 +5651,7 @@
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -5602,8 +5703,6 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="get-timeout-ok" />
-
       <field name="xid" domain="xid" label="Transaction xid">
         <doc>
           Specifies the xid of the transaction branch for getting the timeout.
@@ -5618,23 +5717,21 @@
 
         <assert check="notnull" />
       </field>
-    </method>
-
-    <!-- - Method: dtx-coordination.get-timeout-ok - - - - - - - - - - - - - - - - - - - - - - - -->
 
-    <method name="get-timeout-ok" synchronous="1" index="31" label="Return dtx timeout">
-      <doc>
-        Returns the value of the timeout last specified through set-timeout.
-      </doc>
-
-      <chassis name="client" implement="MAY" />
+      <result>
+        <struct size="long" type="31">
+          <doc>
+            Returns the value of the timeout last specified through set-timeout.
+          </doc>
 
-      <field name="timeout" domain="long" label="The current transaction timeout value">
-        <doc>
-          The current transaction timeout value in seconds.
-        </doc>
-        <assert check="notnull" />
-      </field>
+          <field name="timeout" domain="long" label="The current transaction timeout value">
+            <doc>
+              The current transaction timeout value in seconds.
+            </doc>
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
     <!-- - Method: dtx-coordination.prepare  - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -5674,13 +5771,11 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="prepare-ok" />
-
       <field name="ticket" domain="access-ticket" label="Access-ticket for specific realm">
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -5712,34 +5807,32 @@
 
         <assert check="notnull" />
       </field>
-    </method>
-
-    <!-- - Method: dtx-coordination.prepare-ok - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="prepare-ok" synchronous="1" index="41" label="Confirm dtx prepare">
-      <doc>
-        This method confirms to the client that the transaction branch is prepared or specify the
-        error condition.
-      </doc>
 
-      <chassis name="client" implement="MAY" />
+      <result>
+        <struct size="long" type="41">
+          <doc>
+            This method confirms to the client that the transaction branch is prepared or specify the
+            error condition.
+          </doc>
 
-      <field name="status" domain="short" label="Status code">
-        <doc>
-          The value of this field may be one of the following constants:
+          <field name="status" domain="short" label="Status code">
+            <doc>
+              The value of this field may be one of the following constants:
 
-          xa-ok: Normal execution.
+              xa-ok: Normal execution.
 
-          xa-rdonly: The transaction branch was read-only and has been committed.
+              xa-rdonly: The transaction branch was read-only and has been committed.
 
-          xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
-              reason.
+              xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
+                  reason.
 
-          xa-rbtimeout: The work represented by this transaction branch took too long.
-        </doc>
+              xa-rbtimeout: The work represented by this transaction branch took too long.
+            </doc>
 
-        <assert check="notnull" />
-      </field>
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
     <!-- - Method: dtx-coordination.recover  - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -5773,13 +5866,11 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="recover-ok" />
-
       <field name="ticket" domain="access-ticket" label="Access-ticket for specific realm">
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -5811,33 +5902,31 @@
         </doc>
         <assert check="notnull" />
       </field>
-    </method>
 
-    <!-- - Method: dtx-coordination.recover-ok - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="recover-ok" synchronous="1" index="51" label="List of recovered xids">
-      <doc>
-        Returns to the client a table with single item that is a sequence of transaction xids that
-        are in a prepared or heuristically completed state.
-      </doc>
-
-      <chassis name="client" implement="MAY" />
-
-      <field name="in-doubt" domain="table" label="Table of xids to be recovered">
-        <doc>
-          Table containing the sequence of xids to be recovered (xids that are in a prepared or
-          heuristically completed state).
-        </doc>
-
-        <rule name="xid-sequence">
+      <result>
+        <struct size="long" type="51">
           <doc>
-            The field table must contain a field called 'xids' of type sequence of longstrs
-            representing the xids that are in a prepared or heuristically completed state.
+            Returns to the client a table with single item that is a sequence of transaction xids that
+            are in a prepared or heuristically completed state.
           </doc>
-        </rule>
 
-        <assert check="notnull" />
-      </field>
+          <field name="in-doubt" domain="table" label="Table of xids to be recovered">
+            <doc>
+              Table containing the sequence of xids to be recovered (xids that are in a prepared or
+              heuristically completed state).
+            </doc>
+
+            <rule name="xid-sequence">
+              <doc>
+                The field table must contain a field called 'xids' of type sequence of longstrs
+                representing the xids that are in a prepared or heuristically completed state.
+              </doc>
+            </rule>
+
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
     <!-- - Method: dtx-coordination.rollback - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -5864,13 +5953,11 @@
 
       <chassis name="server" implement="MAY" />
 
-      <response name="rollback-ok" />
-
       <field name="ticket" domain="access-ticket" label="Access-ticket for specific realm">
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -5902,43 +5989,41 @@
 
         <assert check="notnull" />
       </field>
-    </method>
-
-    <!-- - Method: dtx-coordination.rollback-ok  - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="rollback-ok" synchronous="1" index="61" label="Confirm dtx rollback">
-      <doc>
-        This method confirms to the client that the transaction branch is rolled back or specify the
-        error condition.
-      </doc>
 
-      <chassis name="client" implement="MAY" />
+      <result>
+        <struct size="long" type="61">
+          <doc>
+            This method confirms to the client that the transaction branch is rolled back or specify the
+            error condition.
+          </doc>
 
-      <field name="status" domain="short" label="Status code">
-        <doc>
-          The value of this field may be one of the following constants:
+          <field name="status" domain="short" label="Status code">
+            <doc>
+              The value of this field may be one of the following constants:
 
-          xa-ok: Normal execution
+              xa-ok: Normal execution
 
-          xa-heurhaz: Due to some failure, the work done on behalf of the specified transaction
-              branch may have been heuristically completed.
+              xa-heurhaz: Due to some failure, the work done on behalf of the specified transaction
+                  branch may have been heuristically completed.
 
-          xa-heurcom: Due to a heuristic decision, the work done on behalf of the specified
-              transaction branch was committed.
+              xa-heurcom: Due to a heuristic decision, the work done on behalf of the specified
+                  transaction branch was committed.
 
-          xa-heurrb: Due to a heuristic decision, the work done on behalf of the specified
-              transaction branch was rolled back.
+              xa-heurrb: Due to a heuristic decision, the work done on behalf of the specified
+                  transaction branch was rolled back.
 
-          xa-heurmix: Due to a heuristic decision, the work done on behalf of the specified
-              transaction branch was partially committed and partially rolled back.
+              xa-heurmix: Due to a heuristic decision, the work done on behalf of the specified
+                  transaction branch was partially committed and partially rolled back.
 
-          xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
-              reason.
+              xa-rbrollback: The broker marked the transaction branch rollback-only for an unspecified
+                  reason.
 
-          xa-rbtimeout: The work represented by this transaction branch took too long.
-        </doc>
-        <assert check="notnull" />
-      </field>
+              xa-rbtimeout: The work represented by this transaction branch took too long.
+            </doc>
+            <assert check="notnull" />
+          </field>
+        </struct>
+      </result>
     </method>
 
     <!-- - Method: dtx-coordination.set-timeout  - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -5974,7 +6059,7 @@
         <doc>
           Access-ticket granted by the server for a specific realm.
         </doc>
-        
+
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "active" access rights to all the
@@ -6013,7 +6098,7 @@
 
   <!-- == Class: tunnel ========================================================================= -->
 
-  <class name="tunnel" handler="tunnel" index="110" label="methods for protocol tunnelling">
+  <class name="tunnel" index="110" label="methods for protocol tunnelling">
     <doc>
       The tunnel methods are used to send blocks of binary data - which can be serialised AMQP
       methods or other protocol frames - between AMQP peers.
@@ -6054,7 +6139,7 @@
 
   <!-- == Class: message ======================================================================= -->
 
-  <class name="message" index="120" handler="channel" label="message transfer">
+  <class name="message" index="120" label="message transfer">
     <doc>
       The message class provides methods that support an industry-standard messaging model.
     </doc>
@@ -6185,7 +6270,6 @@
     <chassis name="client" implement="MUST" />
 
     <!-- - Method: message.transfer  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
     <method name="transfer" index="10" label="transfer a message">
       <doc>
         This method transfers a message between two peers. When a client uses this method to publish
@@ -6213,10 +6297,6 @@
       <chassis name="server" implement="MUST" />
       <chassis name="client" implement="MUST" />
 
-      <!-- commented out to ease transition from 0-9 to 0-10
-      <response name="reject" />
-      -->
-
       <field name="ticket" domain="access-ticket" label="access ticket">
         <rule name="validity" on-failure="access-refused">
           <doc>
@@ -6432,24 +6512,167 @@
 
     </method>
 
-    <!-- - Method: message.consume - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- 
+        the above is still the 0-9 definition and will shortly be
+        removed in favour of the following which is the real 0-10
+        defintion:
 
-    <method name="consume" index="20" label="start a queue consumer">
+    <method name="transfer" content="1" index="10" label="transfer a message">
       <doc>
-        This method asks the server to start a "consumer", which is a transient request for messages
-        from a specific queue. Consumers last as long as the session they were created on, or until
-        the client cancels them.
+        This method transfers a message between two peers. When a client uses this method to publish
+        a message to a broker, the destination identifies a specific exchange. The message will then
+        be routed to queues as defined by the exchange configuration and distributed to any active
+        subscriptions when the transaction, if any, is committed.
+
+        The client may initiate transfers from the broker by starting a subscription using the
+        subscribe method and passing in a destination, then the broker responds with transfer
+        methods to the specified destination as and when messages arrive in the subscribed queue.
       </doc>
 
-      <rule name="simultaneous-consumers">
+      <chassis name="server" implement="MUST" />
+      <chassis name="client" implement="MUST" />
+
+      <field name="ticket" domain="access-ticket" label="access ticket">
+        <rule name="validity" on-failure="access-refused">
+          <doc>
+            The client MUST provide a valid access ticket giving "passive" access rights to the
+            realm for the exchange and "write" access rights to the realm for the queue to which the
+            message will be published.
+          </doc>
+        </rule>
+      </field>
+
+      <field name="destination" domain="destination" label="message destination">
         <doc>
-          The server SHOULD support at least 16 consumers per queue, and ideally, impose no limit
-          except as defined by available resources.
+          Specifies the destination to which the message is to be transferred. The destination can
+          be empty, meaning the default exchange or subscription. If the destination is specified,
+          and that exchange or subscription does not exist, the peer must raise a channel exception.
+        </doc>
+
+        <rule name="blank-destination">
+          <doc>
+            The server MUST accept a blank destination to mean the default exchange.
+          </doc>
+        </rule>
+
+        <rule name="internal-exchange">
+          <doc>
+            If the destination refers to an internal exchange, the server MUST raise a channel
+            exception with a reply code 403 (access refused).
+          </doc>
+        </rule>
+
+        <rule name="message-refusal">
+          <doc>
+            A destination MAY refuse message content in which case it MUST raise a channel exception
+            with reply code 540 (not implemented).
+          </doc>
+        </rule>
+      </field>
+
+      <field name="confirm-mode" domain="confirm-mode" />
+      <field name="acquire-mode" domain="acquire-mode" />
+    </method>
+     -->
+
+    <!-- - Method: message.reject  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="reject" index="160" label="reject a message">
+      <doc>
+        Indicates that the message transfers are un-processable in some way. A message may be
+        rejected for a number of reasons. A server may reject a message if it is unroutable. A
+        client may reject a message if it is invalid.
+      </doc>
+
+      <rule name="alternate-exchange">
+        <doc>
+          When a client rejects a message, the server MUST deliver that message to the
+          alternate-exchange on the queue from which it was delivered. If no alternate-exchange is
+          defined for that queue the broker MAY discard the message.
+        </doc>
+      </rule>
+
+      <rule name="acquisition">
+        <doc>
+          The recipient MUST have acquired a message in order to reject it. If the message is not
+          acquired any reject MUST be ignored.
+        </doc>
+      </rule>
+
+      <chassis name="server" implement="MUST" />
+      <chassis name="client" implement="MAY" />
+
+      <field name="transfers" domain="correlation" />
+      <field name="code" domain="reject-code" />
+      <field name="text" domain="reject-text" />
+    </method>
+
+    <!-- - Method: message.acquire - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="acquire" index="170" label="acquire messages for consumption">
+      <doc>
+        Acquires previously transferred messages for consumption. The acquired ids (if any) are
+        sent via message.acquired.
+      </doc>
+
+      <chassis name="server" implement="MUST" />
+
+      <field name="transfers" domain="correlation" />
+      <!-- do we need this field? -->
+      <field name="mode" domain="octet">
+        <doc>
+          One of:
+            - any (0): acquire any available messages for consumption
+            - all (1): only acquire messages if all are available for consumption
+        </doc>
+      </field>
+    </method>
+
+    <!-- - Method: message.acquired  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="acquired" index="180" label="indicates acquired messages">
+      <doc>
+        Identifies a set of previously transferred messages now available for consumption.
+      </doc>
+
+      <chassis name="client" implement="MAY" />
+
+      <field name="transfers" domain="correlation" />
+    </method>
+
+    <!-- - Method: message.release - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="release" index="190" label="release a message">
+      <doc>
+        Release previously transferred messages that have been acquired for consumption (whether
+        implicitly or explicitly). Released messages will be available for acquisition by other
+        consumers. The order of released messages may be lost.
+      </doc>
+
+      <chassis name="server" implement="MUST" />
+      <chassis name="client" implement="MAY" />
+
+      <field name="transfers" domain="correlation" />
+    </method>
+
+    <!-- - Method: message.subscribe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="subscribe" index="20" label="start a queue subscription">
+      <doc>
+        This method asks the server to start a "subscription", which is a transient request for
+        messages from a specific queue. Subscriptions last as long as the session they were created
+        on, or until the client cancels them.
+      </doc>
+
+      <rule name="simultaneous-subscriptions">
+        <doc>
+          The server SHOULD support at least 16 subscriptions per queue, and ideally, impose no
+          limit except as defined by available resources.
         </doc>
         <doc type="scenario">
-          Create a queue and create consumers on that queue until the server closes the connection.
-          Verify that the number of consumers created was at least sixteen and report the total
-          number.
+          Create a queue and create subscriptions on that queue until the server closes the
+          connection. Verify that the number of subscriptions created was at least sixteen and
+          report the total number.
         </doc>
       </rule>
 
@@ -6459,54 +6682,44 @@
         <rule name="validity" on-failure="access-refused">
           <doc>
             The client MUST provide a valid access ticket giving "read" access rights to the realm
-            for the queue from which the message will be consumed.
+            for the subscribed queue.
           </doc>
           <doc type="scenario">
-            Attempt to create a consumer with an invalid (non-zero) access ticket.
+            Attempt to create a subscription with an invalid (non-zero) access ticket.
           </doc>
         </rule>
       </field>
 
       <field name="queue" domain="queue-name">
         <doc>
-          Specifies the name of the queue to consume from. If the queue name is null, refers to the
-          current queue for the session, which is the last declared queue.
+          Specifies the name of the subscribed queue.
         </doc>
-        <rule name="empty-queue-name" on-failure="not-allowed">
-          <doc>
-            If the queue name is empty the client MUST have previously declared a queue using this
-            session.
-          </doc>
-          <doc type="scenario">
-            Attempt to create a consumer with an empty queue name and no previously declared queue
-            on the session.
-          </doc>
-        </rule>
       </field>
 
       <field name="destination" domain="destination" label="incoming message destination">
         <doc>
-          Specifies the destination for the consumer. The destination is local to a connection, so
-          two clients can use the same destination.
+          Specifies the destination for the subscription. The destination is local to a connection,
+          so two clients can use the same destination.
         </doc>
 
-        <rule name="destination-non-existing-consumer" on-failure="not-allowed">
+        <rule name="destination-non-existing-subscription" on-failure="not-allowed">
           <doc>
-            The client MUST NOT specify a destination that refers to an existing consumer.
+            The client MUST NOT specify a destination that refers to an existing subscription.
           </doc>
           <doc type="scenario">
-            Attempt to create two consumers with the same non-empty destination.
+            Attempt to create two subscriptions with the same non-empty destination.
           </doc>
         </rule>
 
         <rule name="destination-session-bound" on-failure="not-allowed">
           <doc>
-            The destination is valid only within the session from which the consumer was created.
-            i.e. A client MUST NOT create a consumer in one session and then use it in another.
+            The destination is valid only within the session from which the subscription was
+            created. i.e. A client MUST NOT create a subscription in one session and then use it in
+            another.
           </doc>
           <doc type="scenario">
-            Attempt to create a consumer in one session, then use in another session, in which
-            consumers have also been created (to test that the server uses unique destinations).
+            Attempt to create a subscription in one session, then use in another session, in which
+            subscriptions have also been created (to test that the server uses unique destinations).
           </doc>
         </rule>
       </field>
@@ -6518,39 +6731,39 @@
         </doc>
       </field>
 
-      <!-- TODO: Is this still required? There was plenty of discussion about removing this... -->
-      <field name="no-ack" domain="no-ack"
-        label="server auto-acknowledges message without waiting for client">
+      <field name="confirm-mode" domain="confirm-mode">
         <doc>
-          If this field is set the server does not expect acknowledgements for messages. That is,
-          when a message is delivered to the client the server automatically and silently
-          acknowledges it on behalf of the client. This functionality increases performance but at
-          the cost of reliability. Messages can get lost if a client dies before it can deliver them
-          to the application.
+          The default confirm-mode for this subscription.
+        </doc>
+      </field>
+
+      <field name="acquire-mode" domain="acquire-mode">
+        <doc>
+          The default acquire-mode for this subscription.
         </doc>
       </field>
 
       <field name="exclusive" domain="bit" label="request exclusive access">
         <doc>
-          Request exclusive consumer access, meaning only this consumer can access the queue.
+          Request exclusive subscription access, meaning only this subscription can access the queue.
         </doc>
 
         <rule name="in-use" on-failure="access-refused">
           <doc>
-            The client MUST NOT gain exclusive access to a queue that already has active consumers.
+            The client MUST NOT gain exclusive access to a queue that already has active subscriptions.
           </doc>
           <doc type="scenario">
             Open two connections to a server, and in one connection create a shared (non-exclusive)
-            queue and then consume from the queue. In the second connection attempt to consume from
+            queue and then subscribe to the queue. In the second connection attempt to subscribe to
             the same queue using the exclusive option.
           </doc>
         </rule>
       </field>
 
-      <field name="filter" domain="table" label="arguments for consuming">
+      <field name="filter" domain="table" label="arguments for filtering">
         <doc>
-          A set of filters for the consume. The syntax and semantics of these filters depends on the
-          providers implementation.
+          A set of filters for the subscription. The syntax and semantics of these filters depends
+          on the providers implementation.
         </doc>
       </field>
     </method>
@@ -6562,7 +6775,7 @@
         This method cancels a consumer. This does not affect already delivered messages, but it does
         mean the server will not send any more messages for that consumer. The client may receive an
         arbitrary number of messages in between sending the cancel method and receiving the
-        cancel-ok reply.
+        notification of completion of the cancel command.
       </doc>
 
       <rule name="ignore">
@@ -6588,7 +6801,7 @@
 
       <chassis name="server" implement="MUST" />
 
-      <!-- commented out to aid transition to 0-10
+      <!-- 
       <response name="empty" />
       -->
 
@@ -6849,57 +7062,6 @@
       </field>
     </method>
 
-    <!-- - Method: message.empty - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="empty" index="510" label="empty queue">
-      <doc>
-        Signals that a queue does not contain any messages; usually sent in response to the get
-        method.
-      </doc>
-
-      <chassis name="server" implement="MUST" />
-      <chassis name="client" implement="MUST" />
-    </method>
-
-    <!-- - Method: message.reject  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="reject" index="520" label="reject a message">
-      <doc>
-        This response rejects a message. A message may be rejected for a number of reasons.
-      </doc>
-
-      <chassis name="server" implement="MUST" />
-      <chassis name="client" implement="MUST" />
-
-      <field name="code" domain="reject-code" label="reject code">
-        <doc>
-          Code indicating the reason for message rejection.
-        </doc>
-      </field>
-
-      <field name="text" domain="reject-text" label="reason for message rejection">
-        <doc>
-          A string containing additional details on the reason for message rejection.
-        </doc>
-      </field>
-    </method>
-
-    <!-- - Method: message.offset  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="offset" index="530" label="return an offset">
-      <doc>
-        Returns the data offset into a reference body; usually sent in response to resume method.
-      </doc>
-
-      <chassis name="server" implement="MUST" />
-      <chassis name="client" implement="MUST" />
-
-      <field name="value" domain="offset" label="offset into a reference body">
-        <doc>
-          Offset in bytes into message body data.
-        </doc>
-      </field>
-    </method>
     <!-- - Method: message.flow-mode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <method name="flow-mode" index="120" label="set the flow control mode">
@@ -7023,11 +7185,40 @@
       <field name="destination" domain="destination" />
     </method>
 
+    <!-- - Method: message.empty - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="empty" index="510" label="empty queue">
+      <doc>
+        Signals that a queue does not contain any messages; usually sent in response to the get
+        method.
+      </doc>
+
+      <chassis name="server" implement="MUST" />
+      <chassis name="client" implement="MUST" />
+    </method>
+
+    <!-- - Method: message.offset  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="offset" index="530" label="return an offset">
+      <doc>
+        Returns the data offset into a reference body; usually sent in response to resume method.
+      </doc>
+
+      <chassis name="server" implement="MUST" />
+      <chassis name="client" implement="MUST" />
+
+      <field name="value" domain="offset" label="offset into a reference body">
+        <doc>
+          Offset in bytes into message body data.
+        </doc>
+      </field>
+    </method>
+
   </class>
 
   <!-- == Class: binding ======================================================================= -->
 
-  <class name="binding" handler="binding" index="130"
+  <class name="binding" index="130"
     label="provides the ability to query bindings">
     <doc>
       This is a utility class for querying and exchange about its bindings to queues.
@@ -7041,14 +7232,11 @@
     <method name="query" synchronous="1" index="10"
       label="request information about bindings to an exchange">
       <doc>
-        This method is used to request information on the bindings to a particular exchange.  That
-        information is conveyed in a query-ok method.
+        This method is used to request information on the bindings to a particular exchange.
       </doc>
 
       <chassis name="server" implement="MUST" />
 
-      <response name="query-ok" />
-
       <field name="ticket" domain="access-ticket">
         <rule name="validity" on-failure="access-refused">
           <doc>
@@ -7084,57 +7272,55 @@
           will ignore the arguments on bindings when searching for a match
         </doc>
       </field>
-    </method>
-
-    <!-- - Method: binding.query-ok  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <method name="query-ok" synchronous="1" index="11"
-      label="returns information about bindings to exchange">
-      <doc>
-        This method is used in response to a query and conveys information on the bindings to a
-        particular exchange.
-      </doc>
 
-      <chassis name="client" implement="MUST" />
-
-      <field name="exchange-not-found" domain="bit" label="indicate an unknown exchange">
-        <doc>
-           If set, the exchange for which information was requested is not known.
-        </doc>
-      </field>
-
-      <field name="queue-not-found" domain="bit" label="indicate an unknown queue">
-        <doc>
-           If set, the queue specified is not known.
-        </doc>
-      </field>
-
-      <field name="queue-not-matched" domain="bit" label="indicate no matching queue">
-        <doc>
-          A bit which if set indicates that no binding was found from the specified exchange to the
-          specified queue.
-        </doc>
-      </field>
-
-      <field name="key-not-matched" domain="bit" label="indicate no matching routing key">
-        <doc>
-          A bit which if set indicates that no binding was found from the specified exchange with
-          the specified routing key.
-        </doc>
-      </field>
+      <result>
+        <struct size="long" type="11">
+          <doc>
+            This method is used in response to a query and conveys information on the bindings to a
+            particular exchange.
+          </doc>
+
+          <field name="exchange-not-found" domain="bit" label="indicate an unknown exchange">
+            <doc>
+               If set, the exchange for which information was requested is not known.
+            </doc>
+          </field>
+
+          <field name="queue-not-found" domain="bit" label="indicate an unknown queue">
+            <doc>
+               If set, the queue specified is not known.
+            </doc>
+          </field>
+
+          <field name="queue-not-matched" domain="bit" label="indicate no matching queue">
+            <doc>
+              A bit which if set indicates that no binding was found from the specified exchange to the
+              specified queue.
+            </doc>
+          </field>
+
+          <field name="key-not-matched" domain="bit" label="indicate no matching routing key">
+            <doc>
+              A bit which if set indicates that no binding was found from the specified exchange with
+              the specified routing key.
+            </doc>
+          </field>
+
+          <field name="args-not-matched" domain="bit" label="indicate no matching args">
+            <doc>
+              A bit which if set indicates that no binding was found from the specified exchange with
+              the specified arguments.
+            </doc>
+          </field>
+        </struct>
+      </result>
+    </method>
 
-      <field name="args-not-matched" domain="bit" label="indicate no matching args">
-        <doc>
-          A bit which if set indicates that no binding was found from the specified exchange with
-          the specified arguments.
-        </doc>
-      </field>
-     </method>
   </class>
 
   <!-- == Class: execution ===================================================================== -->
 
-  <class name="execution" handler="execution" index="140">
+  <class name="execution" index="140">
     <doc>
       This class allows for efficiently communicating information about completion of processing.
     </doc>
@@ -7193,8 +7379,50 @@
       </field>
     </method>
 
+    <!-- - Method: execution.noop  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="noop" index="30" label="a command that does nothing">
+      <doc>
+        This command may be used when it is desirable to send a command that has no effect. This
+        situation can occur after issuing a number of commands with sync=False. If, after issuing
+        the commands, a peer wishes to receive confirmation of completion, the peer can do so by
+        sending an execution.noop command with sync=True.
+      </doc>
+
+      <chassis name="server" implement="MUST"/>
+      <chassis name="client" implement="MUST"/>
+    </method>
+
+    <!-- - Method: execution.result  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="result" index="40" label="carries execution results">
+      <doc>
+        This method carries data resulting from the execution of a command.
+      </doc>
+
+      <chassis name="server" implement="MUST"/>
+      <chassis name="client" implement="MUST"/>
+
+      <field name="command-id" domain="command-id"/>
+      <field name="data" domain="long-struct"/>
+    </method>
+
+    <!-- - Method: execution.sync  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <method name="sync" index="50" label="request notification of completion for issued commands">
+      <doc>
+        Requests notification (via execution.complete) when all commands issued prior to the sync
+        control are complete. If the recipient of this control has already notified the
+        sender that said commands are complete, it may safely ignore the control.
+      </doc>
+
+      <chassis name="server" implement="MUST"/>
+      <chassis name="client" implement="MUST"/>
+    </method>
+
   </class>
 
+
   <!-- This is no longer an official part of 0-10 and is included here only as a transitional aid -->
   <!-- ==  CHANNEL  ========================================================== -->