Unbreaking trunk due to erroneous commit

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

12 files changed, 841 insertions, 16 deletions

diff --git a/gentools/build.xml b/gentools/build.xml
index d35790f714..1364566f3a 100644
--- a/gentools/build.xml
+++ b/gentools/build.xml
@@ -22,7 +22,13 @@
 	<property name="src" location="src" />
 
 	<target name="compile">
-    	<javac srcdir="${src}" source="1.5" fork="true" debug="on"/>
+    	<javac srcdir="${src}" source="1.5" fork="true" debug="on">
+			<classpath>
+			    <fileset dir="${src}/../lib">
+					<include name="**/*.jar"/>
+				</fileset>
+			</classpath>
+		</javac>
     </target>
     
 	<target name="clean">
diff --git a/gentools/lib/LICENSE b/gentools/lib/LICENSE
new file mode 100644
index 0000000000..43fa6abd19
--- /dev/null
+++ b/gentools/lib/LICENSE
@@ -0,0 +1,202 @@
+                               Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/gentools/lib/NOTICE b/gentools/lib/NOTICE
new file mode 100644
index 0000000000..09e9ae4902
--- /dev/null
+++ b/gentools/lib/NOTICE
@@ -0,0 +1,2 @@
+This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/gentools/lib/README.txt b/gentools/lib/README.txt
new file mode 100644
index 0000000000..eb364ece53
--- /dev/null
+++ b/gentools/lib/README.txt
@@ -0,0 +1,102 @@
+--------

+Velocity

+--------

+

+Welcome to Velocity. Velocity is a general purpose template engine

+written in Java. For more information about Velocity, please look at the

+HTML documentation in the docs/ directory, as well as the Velocity

+web site

+

+  http://jakarta.apache.org/velocity/index.html

+

+Here is a description of what each of the top level directories

+contains. Please consult the documentation in each of the lower level

+directories for information that is specific to their contents.

+

+bin/        This is a temporary build directory.

+build/      This is where the build scripts live.

+docs/       This is where the documentation lives.

+examples/   This is where the examples live.

+src/        This is where all of the source code to Velocity lives.

+test/       This is where all of the tests live.

+xdocs/      This is the .xml files for building the .html files

+            related to the website and documentation.

+            

+REQUIREMENTS

+------------

+

+The Java 2 SDK is required to build Velocity.

+

+For users that wish to use Log4J as the logging

+system, version 1.1 or newer of Log4J is required.

+

+

+INCLUDED PRE-BUILT JARS

+-----------------------

+If you are using an offical Velocity release distribution, 

+you will find two pre-built Velocity jars in the top level 

+directory.

+

+PLEASE NOTE : Starting with the 1.2 release, we include two jars 

+ with the distribution.

+

+1) velocity-<version>.jar : The Velocity jar that does not include

+any external dependencies needed by Velocity, such as the 

+jakarta-commons-collection classes, Jakarta Avalon Logkit, or 

+Jakarta ORO. We do this to allow you to use whatever version of

+collections, logkit, etc that you wish w/o fear of collision.

+These jars are included in the distribution, in

+the build/lib directory, or at the respective project sites.

+

+2) velocity-dep-<version>.jar : This is a Velocity jar that includes

+all dependencies that were included with previous distribution

+jars.  It is intended as a convenience to allow you to drop

+this 1.3 (or later)  distribution in place of existing 1.1 or 1.2-dep

+ distributions.

+

+Please see the developers guide for more information.

+

+BUILDING VELOCITY

+-----------------

+

+In order to get started with Velocity, you may want to build it. 

+

+Building Velocity is easy.  All components necessary to build Velocity are

+included, except for the Java 2 SDK and the fabulous Ant build tool

+from the Jakarta project.

+

+http://jakarta.apache.org/ant/

+

+Note that you must use Ant version 1.4 or later.

+

+To build Velocity's jar, change directory into the build/ directory and 

+simply type :

+

+ant jar

+

+This will create a bin/ directory containing the Velocity .jar file. Be

+sure to update your classpath to include Velocity's .jar file, or when using a 

+modern servlet container, put it in the WEB-INF/lib directory.

+

+If you wish to build a Velocity jar that contains all dependencies, we have

+provided an optional build target for our convenience :

+

+ant jar-dep

+

+This will build a complete Velocity jar with dependencies included, and it can

+be found in the /bin directory as

+

+velocity-dep-<version>.jar

+

+TRYING THE EXAMPLES

+-------------------

+

+After building Velocity, you can also buld the examples that are included

+with the Velocity distribution.  These examples show how to use Velocity

+in your Java applications and Servlets.  There also are examples of

+how to use Anakia, a XML transformation engine and an example of a servlet-

+based forum application.

+

+For more information, please see the README.txt in the examples/ directory.

+

+-The Velocity Team

diff --git a/gentools/lib/velocity-1.4.jar b/gentools/lib/velocity-1.4.jar
new file mode 100644
index 0000000000..04ec9d2f85
--- /dev/null
+++ b/gentools/lib/velocity-1.4.jar
diff --git a/gentools/lib/velocity-dep-1.4.jar b/gentools/lib/velocity-dep-1.4.jar
new file mode 100644
index 0000000000..375712b0e8
--- /dev/null
+++ b/gentools/lib/velocity-dep-1.4.jar
diff --git a/gentools/src/org/apache/qpid/gentools/Generator.java b/gentools/src/org/apache/qpid/gentools/Generator.java
index ccf61bfbce..9dc816dc67 100644
--- a/gentools/src/org/apache/qpid/gentools/Generator.java
+++ b/gentools/src/org/apache/qpid/gentools/Generator.java
@@ -274,20 +274,25 @@ public abstract class Generator implements LanguageConverter
                 versionTemplateFiles = versionTemplateDirectory.listFiles(_tmplFileFilter);
             }
 
-            for (File templateFile : templateFiles)
-            {
-                System.out.println(type.getName() + " template file(s):");
-                System.out.println("  " + templateFile.getCanonicalPath());
-                typeTemplates.add(new NamedTemplate(type.getName(), templateFile));
-            }
-
-
-            for (File versionTemplateFile : versionTemplateFiles)
-            {
-                System.out.println(type.getName() + " template file(s):");
-                System.out.println("  " + versionTemplateFile.getCanonicalPath());
-                versionSpecificTypeTemplates.add(new NamedTemplate(type.getName() + Utils.FILE_SEPARATOR + "version", versionTemplateFile));
-            }
+			if(templateFiles != null)
+			{
+	            for (File templateFile : templateFiles)
+	            {
+	                System.out.println(type.getName() + " template file(s):");
+	                System.out.println("  " + templateFile.getCanonicalPath());
+	                typeTemplates.add(new NamedTemplate(type.getName(), templateFile));
+	            }
+			}
+
+            if(versionTemplateFiles != null)
+			{
+				for (File versionTemplateFile : versionTemplateFiles)
+	            {
+	                System.out.println(type.getName() + " template file(s):");
+	                System.out.println("  " + versionTemplateFile.getCanonicalPath());
+	                versionSpecificTypeTemplates.add(new NamedTemplate(type.getName() + Utils.FILE_SEPARATOR + "version", versionTemplateFile));
+	            }
+			}
 
         }
     }
diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml
index 40331a8a84..790531a2c1 100644
--- a/java/common/protocol-version.xml
+++ b/java/common/protocol-version.xml
@@ -33,9 +33,12 @@
   <target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired">
     <mkdir dir="${generated.dir}"/>
     <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true">
-    	<arg line="-j -o ${generated.dir} -t ${gentools.home}/templ.java ${xml.spec.list}" />
+    	<arg line="-j -o ${generated.dir} -t C:\RedHat\etp\trunk\qpid\java\common\templates ${xml.spec.list}" />
         <classpath>
           <pathelement path="${gentools.home}/src" />
+			    <fileset dir="${gentools.home}/lib">
+					<include name="**/*.jar"/>
+				</fileset>
         </classpath>
     </java>
     <touch file="${generated.timestamp}" />
diff --git a/java/common/templates/method/MethodBodyClass.tmpl b/java/common/templates/method/MethodBodyClass.tmpl
new file mode 100644
index 0000000000..eb730fd891
--- /dev/null
+++ b/java/common/templates/method/MethodBodyClass.tmpl
@@ -0,0 +1,183 @@
+&{${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}
+
+    protected 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 AMQFrame createAMQFrame(int channelId, byte major, byte minor
+%{FLIST}    ${mb_field_parameter_list}
+                                         )
+    {
+        return createAMQFrame(channelId, major, minor, getClazz(major,minor), getMethod(major,minor)
+%{FLIST}    ${mb_field_passed_parameter_list}
+        );
+
+                 
+        
+    }
+	
+	public static AMQFrame createAMQFrame(int channelId, byte major, byte minor, int clazzID, int methodID
+%{FLIST}    ${mb_field_parameter_list}
+                                         )
+    {
+        ${CLASS}${METHOD}Body body = new ${CLASS}${METHOD}Body(major, minor, clazzID, methodID
+%{FLIST}    ${mb_field_passed_parameter_list}
+        );
+
+                 
+        AMQFrame frame = new AMQFrame(channelId, body);
+        return frame;
+    }
+
+}
diff --git a/java/common/templates/model/AmqpConstantsClass.tmpl b/java/common/templates/model/AmqpConstantsClass.tmpl
new file mode 100644
index 0000000000..8d459f2977
--- /dev/null
+++ b/java/common/templates/model/AmqpConstantsClass.tmpl
@@ -0,0 +1,37 @@
+&{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/java/common/templates/model/MethodRegistryClass.tmpl b/java/common/templates/model/MethodRegistryClass.tmpl
new file mode 100644
index 0000000000..388a1a936f
--- /dev/null
+++ b/java/common/templates/model/MethodRegistryClass.tmpl
@@ -0,0 +1,158 @@
+&{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 java.util.HashMap;
+import org.apache.log4j.Logger;
+import org.apache.mina.common.ByteBuffer;
+
+public class MainRegistry
+{
+	private static final HashMap<Long, AMQMethodBodyInstanceFactory> classIDMethodIDVersionBodyMap = new HashMap<Long, AMQMethodBodyInstanceFactory>();
+
+	
+    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}
+
+        configure();
+    }
+    
+    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(null,
+                "Unable to find a suitable decoder for class " + classID + " and method " +
+                methodID + " in AMQP version " + major + "-" + minor + ".", null);
+        }
+        return bodyFactory.newInstance(major, minor, in, size);
+
+	    
+    }
+	
+    
+	public static VersionSpecificRegistry getVersionSpecificRegistry(ProtocolVersion pv)
+	{
+        return getVersionSpecificRegistry(pv.getMajorVersion(), pv.getMinorVersion());
+    }
+	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);
+        
+    }
+
+	
+    private static void configure()
+    {
+        for(int i = 0 ; i < _specificRegistries.length; i++)
+        {
+            VersionSpecificRegistry[] registries = _specificRegistries[i];
+            if(registries != null)
+            {
+                for(int j = 0 ; j < registries.length; j++)
+                {
+                    VersionSpecificRegistry registry = registries[j];
+                    
+                    if(registry != null)
+                    {
+                        registry.configure();
+                    }
+                }
+            }
+        }
+        
+    }
+    
+}
diff --git a/java/common/templates/model/ProtocolVersionListClass.tmpl b/java/common/templates/model/ProtocolVersionListClass.tmpl
new file mode 100644
index 0000000000..4a2592d11b
--- /dev/null
+++ b/java/common/templates/model/ProtocolVersionListClass.tmpl
@@ -0,0 +1,127 @@
+&{ProtocolVersion.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.SortedSet;
+import java.util.Collections;
+import java.util.TreeSet;
+
+
+public class ProtocolVersion  implements Comparable
+{
+    private final byte _majorVersion;
+    private final byte _minorVersion;
+
+
+    public ProtocolVersion(byte majorVersion, byte minorVersion)
+    {
+        _majorVersion = majorVersion;
+        _minorVersion = minorVersion;
+    }
+
+    public byte getMajorVersion()
+    {
+        return _majorVersion;
+    }
+
+    public byte getMinorVersion()
+    {
+        return _minorVersion;
+    }
+
+
+    public int compareTo(Object o)
+    {
+        ProtocolVersion pv = (ProtocolVersion) o;
+        if(getMajorVersion() > pv.getMajorVersion())
+        {
+            return 1;
+        }
+        else if(getMajorVersion() < pv.getMajorVersion())
+        {
+            return -1;
+        }
+        else if(getMajorVersion() > pv.getMajorVersion())
+        {
+            return 1;
+        }
+        else if(getMinorVersion() < pv.getMinorVersion())
+        {
+            return -1;
+        }
+        else
+        {
+            return 0;
+        }
+
+    }
+
+    public boolean equals(Object o)
+    {
+        return o != null && (o == this || (compareTo(o) == 0));
+    }
+
+    public int hashCode()
+    {
+        return (0xFF & (int)_minorVersion) | ((0xFF & (int)_majorVersion) << 8);
+    }
+    
+    
+    public boolean isSupported()
+    {
+        return _supportedVersions.contains(this);
+    }
+    
+    public static ProtocolVersion getLatestSupportedVersion()
+    {
+        return _supportedVersions.last();
+    }
+    
+    private static final SortedSet<ProtocolVersion> _supportedVersions;
+
+    static
+    {
+        SortedSet<ProtocolVersion> versions = new TreeSet<ProtocolVersion>();
+
+%{VLIST}        versions.add(new ProtocolVersion((byte)${major},(byte)${minor}));
+
+        _supportedVersions = Collections.unmodifiableSortedSet(versions);
+    }
+
+    
+    public static SortedSet<ProtocolVersion> getSupportedProtocolVersions()
+    {
+        return _supportedVersions;
+    }
+    
+    
+    
+    
+
+}