QPID-832 merge M2.x

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

11 files changed, 661 insertions, 168 deletions

diff --git a/java/common/templates/model/ClientMethodDispatcherInterface.vm b/java/common/templates/model/ClientMethodDispatcherInterface.vm
new file mode 100644
index 0000000000..9e4aee7dee
--- /dev/null
+++ b/java/common/templates/model/ClientMethodDispatcherInterface.vm
@@ -0,0 +1,56 @@
+#set( $filename = "ClientMethodDispatcher.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 version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+ 
+package org.apache.qpid.framing;
+
+import org.apache.qpid.AMQException;
+
+
+public interface ClientMethodDispatcher
+{
+
+#foreach( $amqpClass in $model.getClasses() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+#foreach( $amqpMethodVersions in $amqpClass.getMethods() )
+#if( $amqpMethodVersions.inAllVersions() )
+#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) )
+#if( $amqpMethod.isClientMethod() )
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+    public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException;
+#end							
+#end
+#end
+#end
+
+}
\ No newline at end of file
diff --git a/java/common/templates/model/MethodDispatcherInterface.vm b/java/common/templates/model/MethodDispatcherInterface.vm
new file mode 100644
index 0000000000..ff14715fef
--- /dev/null
+++ b/java/common/templates/model/MethodDispatcherInterface.vm
@@ -0,0 +1,39 @@
+#set( $filename = "MethodDispatcher.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 version:

+ #foreach( $supportedVersion in $model.VersionSet )

+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()

+ #end

+ */

+ 

+package org.apache.qpid.framing;

+

+import org.apache.qpid.AMQException;

+

+

+public interface MethodDispatcher extends

+                     ClientMethodDispatcher, ServerMethodDispatcher

+{

+}
\ No newline at end of file
diff --git a/java/common/templates/model/MethodRegistryClass.tmpl b/java/common/templates/model/MethodRegistryClass.tmpl
deleted file mode 100644
index 474d9e31d1..0000000000
--- a/java/common/templates/model/MethodRegistryClass.tmpl
+++ /dev/null
@@ -1,159 +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 java.util.HashMap;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-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 = LoggerFactory.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/MethodRegistryClass.vm b/java/common/templates/model/MethodRegistryClass.vm
new file mode 100644
index 0000000000..759e5e4a42
--- /dev/null
+++ b/java/common/templates/model/MethodRegistryClass.vm
@@ -0,0 +1,104 @@
+#set( $filename = "MethodRegistry.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 version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+ 
+package org.apache.qpid.framing;
+
+import org.apache.mina.common.ByteBuffer;
+
+import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
+
+import java.util.Map;
+import java.util.HashMap;
+
+
+public abstract class MethodRegistry
+{
+    private static final Map<ProtocolVersion, MethodRegistry> _registries =
+            new HashMap<ProtocolVersion, MethodRegistry>();
+
+#foreach( $supportedVersion in $model.VersionSet )
+
+#set( $verName = "_$supportedVersion.getMajor()_$supportedVersion.getMinor()" )
+#set( $regPackage = "org.apache.qpid.framing.amqp$verName" )
+	public static final MethodRegistry registry_$supportedVersion.getMajor()_$supportedVersion.getMinor() = 
+	    new ${regPackage}.MethodRegistry${verName}();
+	
+#end
+ 			
+			
+    public abstract AMQMethodBody convertToBody(ByteBuffer in, long size)
+        throws AMQFrameDecodingException;
+
+    public abstract int getMaxClassId();
+
+    public abstract int getMaxMethodId(int classId);
+
+    
+    protected MethodRegistry(ProtocolVersion pv)
+    {
+        _registries.put(pv, this);
+    }
+
+    public static MethodRegistry getMethodRegistry(ProtocolVersion pv)
+    {
+        return _registries.get(pv);
+    }
+
+#foreach( $amqpClass in $model.getClasses() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+
+#foreach( $amqpMethodVersions in $amqpClass.getMethods() )
+#if( $amqpMethodVersions.isVersionInterfaceConsistent() )
+#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) )
+
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+    public abstract ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(	
+#foreach( $field in $amqpMethod.FieldList )
+#if( $velocityCount == $amqpMethod.getFieldList().size() )
+                                final $field.NativeType $field.Name
+#else
+                                final $field.NativeType $field.Name,
+#end
+#end                            
+	                        );
+
+
+#end
+#end
+#end
+
+
+	public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter();
+	
+}
\ No newline at end of file
diff --git a/java/common/templates/model/ProtocolVersionListClass.tmpl b/java/common/templates/model/ProtocolVersionListClass.vm
index 4a2592d11b..9ac6adfdf5 100644
--- a/java/common/templates/model/ProtocolVersionListClass.tmpl
+++ b/java/common/templates/model/ProtocolVersionListClass.vm
@@ -1,4 +1,4 @@
-&{ProtocolVersion.java}
+#set( $filename = "ProtocolVersion.java" )
 /*
 *
 * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,11 @@
 */
 
 /*
-* This file is auto-generated by ${GENERATOR} - do not modify.
+* This file is auto-generated by $generator - do not modify.
 * Supported AMQP versions:
-%{VLIST} *   ${major}-${minor}
+#foreach( $version in $model.getVersionSet() )
+* $version.getMajor()-$version.getMinor()
+#end
 */
 
 package org.apache.qpid.framing;
@@ -31,6 +33,8 @@ package org.apache.qpid.framing;
 import java.util.SortedSet;
 import java.util.Collections;
 import java.util.TreeSet;
+import java.util.Map;
+import java.util.HashMap;
 
 
 public class ProtocolVersion  implements Comparable
@@ -59,15 +63,33 @@ public class ProtocolVersion  implements Comparable
     public int compareTo(Object o)
     {
         ProtocolVersion pv = (ProtocolVersion) o;
-        if(getMajorVersion() > pv.getMajorVersion())
+		
+		/* 
+		 * 0-8 has it's major and minor numbers the wrong way round (it's actually 8-0)...
+		 * so we need to deal with that case specially
+		 */
+		
+        if((_majorVersion == (byte) 8) && (_minorVersion == (byte) 0))
+		{
+		    ProtocolVersion fixedThis = new ProtocolVersion(_minorVersion, _majorVersion);
+			return fixedThis.compareTo(pv);
+		}
+		
+		if((pv.getMajorVersion() == (byte) 8) && (pv.getMinorVersion() == (byte) 0))
+		{
+			ProtocolVersion fixedOther = new ProtocolVersion(pv.getMinorVersion(), pv.getMajorVersion());
+		    return this.compareTo(fixedOther);    
+		}
+		
+        if(_majorVersion > pv.getMajorVersion())
         {
             return 1;
         }
-        else if(getMajorVersion() < pv.getMajorVersion())
+        else if(_majorVersion < pv.getMajorVersion())
         {
             return -1;
         }
-        else if(getMajorVersion() > pv.getMajorVersion())
+        else if(_minorVersion > pv.getMinorVersion())
         {
             return 1;
         }
@@ -104,14 +126,34 @@ public class ProtocolVersion  implements Comparable
     }
     
     private static final SortedSet<ProtocolVersion> _supportedVersions;
-
+	private static final Map<String, ProtocolVersion> _nameToVersionMap =
+	                         new HashMap<String, ProtocolVersion>();
+    private static final ProtocolVersion _defaultVersion;							 
+
+	
+#foreach( $version in $model.getVersionSet() )
+#set( $versionId = "v$version.getMajor()_$version.getMinor()" )
+        public static final ProtocolVersion $versionId = new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor());
+#end
+	
     static
     {
         SortedSet<ProtocolVersion> versions = new TreeSet<ProtocolVersion>();
 
-%{VLIST}        versions.add(new ProtocolVersion((byte)${major},(byte)${minor}));
-
+#foreach( $version in $model.getVersionSet() )
+#set( $versionId = "v$version.getMajor()_$version.getMinor()" )
+        versions.add($versionId);
+		_nameToVersionMap.put("${version.getMajor()}-${version.getMinor()}", $versionId);
+#end
         _supportedVersions = Collections.unmodifiableSortedSet(versions);
+		
+		
+		ProtocolVersion systemDefinedVersion =
+		    _nameToVersionMap.get(System.getProperty("org.apache.qpid.amqp_version"));
+			
+	    _defaultVersion = (systemDefinedVersion == null) 
+		                      ? getLatestSupportedVersion() 
+							  : systemDefinedVersion;
     }
 
     
@@ -121,7 +163,16 @@ public class ProtocolVersion  implements Comparable
     }
     
     
+
+    public static ProtocolVersion parse(String name)
+    {
+        return _nameToVersionMap.get(name);
+    }
     
+    public static ProtocolVersion defaultProtocolVersion()
+    {
+        return _defaultVersion;
+    }
     
 
 }
diff --git a/java/common/templates/model/ServerMethodDispatcherInterface.vm b/java/common/templates/model/ServerMethodDispatcherInterface.vm
new file mode 100644
index 0000000000..b80d6027b7
--- /dev/null
+++ b/java/common/templates/model/ServerMethodDispatcherInterface.vm
@@ -0,0 +1,56 @@
+#set( $filename = "ServerMethodDispatcher.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 version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+ 
+package org.apache.qpid.framing;
+
+import org.apache.qpid.AMQException;
+
+
+public interface ServerMethodDispatcher
+{
+
+#foreach( $amqpClass in $model.getClasses() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+#foreach( $amqpMethodVersions in $amqpClass.getMethods() )
+#if( $amqpMethodVersions.inAllVersions() )
+#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) )
+#if( $amqpMethod.isServerMethod() )
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+    public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException;
+#end							
+#end
+#end
+#end
+
+}
\ No newline at end of file
diff --git a/java/common/templates/model/AmqpConstantsClass.tmpl b/java/common/templates/model/version/AmqpConstantsClass.vm
index 8d459f2977..8d459f2977 100644
--- a/java/common/templates/model/AmqpConstantsClass.tmpl
+++ b/java/common/templates/model/version/AmqpConstantsClass.vm
diff --git a/java/common/templates/model/version/ClientMethodDispatcherInterface.vm b/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
new file mode 100644
index 0000000000..80705c1a39
--- /dev/null
+++ b/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
@@ -0,0 +1,55 @@
+#set( $filename = "amqp_$version.getMajor()_$version.getMinor()/ClientMethodDispatcher_${version.getMajor()}_${version.getMinor()}.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 version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+ 
+package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.*;
+
+
+public interface ClientMethodDispatcher_${version.getMajor()}_${version.getMinor()} extends ClientMethodDispatcher
+{
+
+#foreach( $amqpClass in $model.getClasses() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+#foreach( $amqpMethodVersions in $amqpClass.getMethods() )
+#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) )
+#if( $amqpMethod.isClientMethod() )
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+    public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException;
+#end							
+#end
+#end
+
+}
\ No newline at end of file
diff --git a/java/common/templates/model/version/MethodDispatcherInterface.vm b/java/common/templates/model/version/MethodDispatcherInterface.vm
new file mode 100644
index 0000000000..8a7b667a91
--- /dev/null
+++ b/java/common/templates/model/version/MethodDispatcherInterface.vm
@@ -0,0 +1,43 @@
+#set( $filename = "amqp_$version.getMajor()_$version.getMinor()/MethodDispatcher_${version.getMajor()}_${version.getMinor()}.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 version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+ 
+package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.*;
+
+
+public interface MethodDispatcher_${version.getMajor()}_${version.getMinor()} 
+    extends MethodDispatcher,
+	        ServerMethodDispatcher_${version.getMajor()}_${version.getMinor()}, 
+            ClientMethodDispatcher_${version.getMajor()}_${version.getMinor()}
+{
+
+}
\ No newline at end of file
diff --git a/java/common/templates/model/version/MethodRegistryClass.vm b/java/common/templates/model/version/MethodRegistryClass.vm
new file mode 100644
index 0000000000..277605e34b
--- /dev/null
+++ b/java/common/templates/model/version/MethodRegistryClass.vm
@@ -0,0 +1,193 @@
+#set( $filename = "amqp_$version.getMajor()_$version.getMinor()/MethodRegistry_${version.getMajor()}_${version.getMinor()}.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 version:
+ *   $version.getMajor()-$version.getMinor()
+ */
+ 
+package org.apache.qpid.framing.amqp_${version.getMajor()}_${version.getMinor()};
+
+import org.apache.qpid.framing.*;
+import org.apache.qpid.protocol.AMQConstant;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.mina.common.ByteBuffer;
+
+import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
+
+
+public class MethodRegistry_$version.getMajor()_$version.getMinor() extends MethodRegistry
+{
+	
+    private static final Logger _log = LoggerFactory.getLogger(MethodRegistry.class);
+
+	private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_$version.getMajor()_$version.getMinor()();
+	
+#set( $specificModel = $model.asSingleVersionModel() )	
+	
+	
+#set( $maxClassId = $specificModel.getMaximumClassId()+1 )	
+	private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[$maxClassId][];
+
+	public MethodRegistry_$version.getMajor()_$version.getMinor()()
+	{
+	    this(new ProtocolVersion((byte)$version.getMajor(),(byte)$version.getMinor()));
+    }
+	
+	public MethodRegistry_$version.getMajor()_$version.getMinor()(ProtocolVersion pv)
+	{
+        super(pv);	
+#foreach( $amqpClass in $specificModel.getClassList() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+
+
+
+		// Register method body instance factories for the $amqpClassNameUpperCamel class.
+
+#set( $maxMethodId = $amqpClass.getMaximumMethodId()+1 )		
+        _factories[$amqpClass.getClassId()] = new AMQMethodBodyInstanceFactory[$maxMethodId];
+		
+#foreach( $amqpMethod in $amqpClass.getMethodList() )
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+        _factories[$amqpClass.getClassId()][$amqpMethod.getMethodId()] = ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl.getFactory(); 
+#end		
+		
+#end
+		
+		
+	}
+
+
+    public AMQMethodBody convertToBody(ByteBuffer in, long size)
+        throws AMQFrameDecodingException
+    {
+	    int classId = in.getUnsignedShort();
+		int methodId = in.getUnsignedShort();
+	
+        AMQMethodBodyInstanceFactory bodyFactory;
+        try
+        {
+            bodyFactory = _factories[classId][methodId];
+        }
+        catch(NullPointerException e)
+        {
+            throw new AMQFrameDecodingException(AMQConstant.COMMAND_INVALID,
+                "Class " + classId + " unknown in AMQP version $version.getMajor()-$version.getMinor()"
+                 + " (while trying to decode class " + classId + " method " + methodId + ".");
+        }
+        catch(IndexOutOfBoundsException e)
+        {
+            if(classId >= _factories.length)
+            {
+                throw new AMQFrameDecodingException(AMQConstant.COMMAND_INVALID,
+                    "Class " + classId + " unknown in AMQP version $version.getMajor()-$version.getMinor()"
+                     + " (while trying to decode class " + classId + " method " + methodId + ".");
+
+            }
+            else
+            {
+                throw new AMQFrameDecodingException(AMQConstant.COMMAND_INVALID,
+                    "Method " + methodId + " unknown in AMQP version $version.getMajor()-$version.getMinor()"
+                     + " (while trying to decode class " + classId + " method " + methodId + ".");
+
+            }
+        }
+
+
+        if (bodyFactory == null)
+        {
+            throw new AMQFrameDecodingException(AMQConstant.COMMAND_INVALID,
+                "Method " + methodId + " unknown in AMQP version $version.getMajor()-$version.getMinor()"
+                 + " (while trying to decode class " + classId + " method " + methodId + ".");
+        }
+
+
+        return bodyFactory.newInstance(in, size);
+
+
+    }
+
+
+    public int getMaxClassId()
+	{
+	    return $specificModel.getMaximumClassId();
+	}
+    
+    public int getMaxMethodId(int classId)
+	{
+        return _factories[classId].length - 1;	
+	}
+	
+
+
+#foreach( $amqpClass in $specificModel.getClassList() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+
+		
+#foreach( $amqpMethod in $amqpClass.getMethodList() )
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+    public ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body create${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body(	
+#foreach( $field in $amqpMethod.FieldList )
+#if( $velocityCount == $amqpMethod.getFieldList().size() )
+                                final $field.NativeType $field.Name
+#else
+                                final $field.NativeType $field.Name,
+#end
+#end                            
+	                        )
+    {
+	    return new ${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}BodyImpl(
+#foreach( $field in $amqpMethod.FieldList )
+#if( $velocityCount == $amqpMethod.getFieldList().size() )
+                                $field.Name
+#else
+                                $field.Name,
+#end
+#end                            
+		                    );
+    }
+    
+#end		
+		
+#end
+		
+	
+    public ProtocolVersionMethodConverter getProtocolVersionMethodConverter()
+    {
+        return _protocolVersionConverter;
+    }	
+
+    
+}
diff --git a/java/common/templates/model/version/ServerMethodDispatcherInterface.vm b/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
new file mode 100644
index 0000000000..db388fcc65
--- /dev/null
+++ b/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
@@ -0,0 +1,55 @@
+#set( $filename = "amqp_$version.getMajor()_$version.getMinor()/ServerMethodDispatcher_${version.getMajor()}_${version.getMinor()}.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 version:
+ #foreach( $supportedVersion in $model.VersionSet )
+ *   $supportedVersion.getMajor()-$supportedVersion.getMinor()
+ #end
+ */
+ 
+package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.*;
+
+
+public interface ServerMethodDispatcher_${version.getMajor()}_${version.getMinor()} extends ServerMethodDispatcher
+{
+
+#foreach( $amqpClass in $model.getClasses() )
+#set( $amqpClassNameFirstChar = $amqpClass.getName().substring(0,1) )
+#set( $amqpClassNameFirstCharU = $amqpClassNameFirstChar.toUpperCase() )
+#set( $amqpClassNameUpperCamel = "$amqpClassNameFirstCharU$amqpClass.getName().substring(1)" )
+#foreach( $amqpMethodVersions in $amqpClass.getMethods() )
+#set( $amqpMethod = $amqpMethodVersions.asSingleVersionMethod($amqpMethodVersions.getVersionSet().first()) )
+#if( $amqpMethod.isServerMethod() )
+#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
+#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
+#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
+    public boolean dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}Body body, int channelId) throws AMQException;
+#end							
+#end
+#end
+
+}
\ No newline at end of file