12 files changed, 0 insertions, 1114 deletions
diff --git a/java/common/templates/method/MethodBodyInterface.vm b/java/common/templates/method/MethodBodyInterface.vm
deleted file mode 100644
index d5feba12de..0000000000
--- a/java/common/templates/method/MethodBodyInterface.vm
+++ /dev/null
@@ -1,62 +0,0 @@
-#macro( UpperCamel $name )
-#set( $name = "${name.substring(0,1).toUpperCase()}${name.substring(1)}" )
-#end
-#macro( toUpperCamel $name )${name.substring(0,1).toUpperCase()}${name.substring(1)}#end
-
-
-
-#set( $amqp_ClassName = $amqpClass.Name) 
-#UpperCamel( $amqp_ClassName )
-#set( $amqp_MethodName = $amqpMethod.Name ) 
-#UpperCamel( $amqp_MethodName )
-#set( $javaClassName = "${amqp_ClassName}${amqp_MethodName}Body" )
-
-
-#set( $filename = "${javaClassName}.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;
-
-
-public interface ${javaClassName} extends EncodableAMQDataBlock, AMQMethodBody
-{
-    
-    
-#foreach( $field in $amqpMethod.Fields )
-
-#if( $amqpMethod.isCommon( $field ) )
-    public $field.ConsistentNativeType get#toUpperCamel( ${field.Name} )();
-#end
-#end
-
-
-
-}
diff --git a/java/common/templates/method/version/MethodBodyClass.vm b/java/common/templates/method/version/MethodBodyClass.vm
deleted file mode 100644
index a739110d70..0000000000
--- a/java/common/templates/method/version/MethodBodyClass.vm
+++ /dev/null
@@ -1,213 +0,0 @@
-#macro( UpperCamel $name )
-#set( $name = "${name.substring(0,1).toUpperCase()}${name.substring(1)}" )
-#end
-#macro( toUpperCamel $name )${name.substring(0,1).toUpperCase()}${name.substring(1)}#end
-
-
-
-#set( $amqp_ClassName = $amqpClass.Name) 
-#UpperCamel( $amqp_ClassName )
-#set( $amqp_MethodName = $amqpMethod.Name ) 
-#UpperCamel( $amqp_MethodName )
-#set( $javaClassName = "${amqp_ClassName}${amqp_MethodName}BodyImpl" )
-#set( $interfaceName = "${amqp_ClassName}${amqp_MethodName}Body" )
-#set( $amqpPackageName = "amqp_$version.getMajor()_$version.getMinor()" )
-
-#set( $filename = "${amqpPackageName}/${javaClassName}.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()
- */
- 
-#set( $clazz = $amqpClass.asSingleVersionClass( $version ) ) 
-#set( $method = $amqpMethod.asSingleVersionMethod( $version ) )
- 
-package org.apache.qpid.framing.amqp_$version.getMajor()_$version.getMinor();
-
-import java.util.HashMap;
-
-import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.framing.*;
-import org.apache.qpid.AMQException;
-
-public class ${javaClassName} extends AMQMethodBody_$version.getMajor()_$version.getMinor() implements $interfaceName
-{
-    private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
-    {
-        public AMQMethodBody newInstance(ByteBuffer in, long size) throws AMQFrameDecodingException
-        {
-            return new ${javaClassName}(in);
-        }
-		
- 
-    };
-    
-	
-    public static AMQMethodBodyInstanceFactory getFactory()
-    {
-        return FACTORY_INSTANCE;
-    }
-
-    public static final int CLASS_ID =  $clazz.ClassId; 
-    
-    public static final int METHOD_ID = $method.MethodId; 
-    
-
-	
-    // Fields declared in specification
-#foreach( $field in $method.ConsolidatedFields )
-    private final $field.NativeType _$field.getName(); // $field.UnderlyingFields
-#end
-
-    
-    // Constructor
-
-    public ${javaClassName}(ByteBuffer buffer) throws AMQFrameDecodingException
-    {
-#foreach( $field in $method.ConsolidatedFields )
-        _$field.Name = read$field.getEncodingType()( buffer );
-#end
-	}
-	
-    public ${javaClassName}(
-#foreach( $field in $method.FieldList )
-#if( $velocityCount == $method.getFieldList().size() )
-                                $field.NativeType $field.Name
-#else
-                                $field.NativeType $field.Name,
-#end
-#end
-                            )
-    {
-#set( $consolidatedFieldName = "" )
-#foreach( $field in $method.FieldList )
-#if( $method.isConsolidated( $field.Name ) )
-#if( !$method.getConsolidatedFieldName( $field.Name ).equals( $consolidatedFieldName ) )
-#if( !$consolidatedFieldName.equals("") )
-        _$consolidatedFieldName = $consolidatedFieldName; // 1
-#end
-#set( $consolidatedFieldName = $method.getConsolidatedFieldName( $field.Name ) )
-        byte $consolidatedFieldName = (byte)0;
-#end
-        if( $field.Name )
-		{		    
-            $consolidatedFieldName = (byte) (((int) $consolidatedFieldName) | (1 << $method.getPositionInBitField( $field.Name )));
-		}
-#if( $velocityCount == $method.getFieldList().size())
-        _$consolidatedFieldName = $consolidatedFieldName; 
-#else  
- 
-#end 
-#else
-#if( !$consolidatedFieldName.equals("") )
-        _$consolidatedFieldName = $consolidatedFieldName; 
-#end
-#set( $consolidatedFieldName = "" )
-        _$field.Name = $field.Name;
-#end
-#end
-    }
-    
-    public int getClazz() 
-    { 
-        return CLASS_ID; 
-    }
-    
-    public int getMethod() 
-    { 
-        return METHOD_ID; 
-    }
-
-    
-#foreach( $field in $method.FieldList )
-    public final $field.NativeType get#toUpperCamel( ${field.Name} )()
-    {
-#if( $method.isConsolidated( $field.Name ) )
-        return (((int)(_$method.getConsolidatedFieldName( $field.Name ))) & ( 1 << $method.getPositionInBitField( $field.Name ))) != 0;
-#else
-        return _$field.Name;
-#end
-    }
-#end
-
-    protected int getBodySize()
-    {      
-#set( $fixedSize = 0 )
-#foreach( $field in $method.ConsolidatedFields )
-#if( $field.isFixedSize() )        
-#set( $fixedSize = $fixedSize + $field.Size )
-#end
-#end
-	    int size = $fixedSize;
-#foreach( $field in $method.ConsolidatedFields )
-#if( ! $field.isFixedSize() )        
-        size += getSizeOf( _$field.Name );
-#end
-#end
-        return size;        
-    }
-
-    public void writeMethodPayload(ByteBuffer buffer)
-    {
-#foreach( $field in $method.ConsolidatedFields )
-        write$field.getEncodingType()( buffer, _$field.Name );
-#end
-    }
-
-    public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
-	{
-#set( $amqpMethodNameFirstChar = $amqpMethod.getName().substring(0,1) )
-#set( $amqpMethodNameFirstCharU = $amqpMethodNameFirstChar.toUpperCase() )
-#set( $amqpMethodNameUpperCamel = "$amqpMethodNameFirstCharU$amqpMethod.getName().substring(1)" )
-#if( $amqpMethod.inAllVersions() )
-    return dispatcher.dispatch${amqpClassNameUpperCamel}${amqpMethodNameUpperCamel}(this, channelId);	
-#else
-    return ((MethodDispatcher_$version.getMajor()_$version.getMinor())dispatcher).dispatch${amqp_ClassName}${amqpMethodNameUpperCamel}(this, channelId);	
-
-#end	
-	    
-	}
-	
-	
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder("[$javaClassName: ");
-#foreach( $field in $method.FieldList )
-        buf.append( "$field.Name=" );
-#if( $field.NativeType == "byte[]" )
-		buf.append(  get#toUpperCamel( $field.Name )() == null  ? "null" : java.util.Arrays.toString( get#toUpperCamel( $field.Name )() ) );
-#else
-		buf.append(  get#toUpperCamel( $field.Name )() );
-#end
-#if( $velocityCount	!= $method.FieldList.size() )
-		buf.append( ", " );		
-#end		
-#end
-        buf.append("]");
-        return buf.toString();
-    }
-
-
-}
diff --git a/java/common/templates/model/ClientMethodDispatcherInterface.vm b/java/common/templates/model/ClientMethodDispatcherInterface.vm
deleted file mode 100644
index 9e4aee7dee..0000000000
--- a/java/common/templates/model/ClientMethodDispatcherInterface.vm
+++ /dev/null
@@ -1,56 +0,0 @@
-#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
deleted file mode 100644
index ff14715fef..0000000000
--- a/java/common/templates/model/MethodDispatcherInterface.vm
+++ /dev/null
@@ -1,39 +0,0 @@
-#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.vm b/java/common/templates/model/MethodRegistryClass.vm
deleted file mode 100644
index 759e5e4a42..0000000000
--- a/java/common/templates/model/MethodRegistryClass.vm
+++ /dev/null
@@ -1,104 +0,0 @@
-#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.vm b/java/common/templates/model/ProtocolVersionListClass.vm
deleted file mode 100644
index 78605c70ff..0000000000
--- a/java/common/templates/model/ProtocolVersionListClass.vm
+++ /dev/null
@@ -1,201 +0,0 @@
-#set( $filename = "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:
-#foreach( $version in $model.getVersionSet() )
-* $version.getMajor()-$version.getMinor()
-#end
-*/
-
-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
-{
-    private final byte _majorVersion;
-    private final byte _minorVersion;
-    private final String _stringFormat;
-
-
-    public ProtocolVersion(byte majorVersion, byte minorVersion)
-    {
-        _majorVersion = majorVersion;
-        _minorVersion = minorVersion;
-        _stringFormat = _majorVersion+"-"+_minorVersion;
-    }
-
-    public byte getMajorVersion()
-    {
-        return _majorVersion;
-    }
-
-    public byte getMinorVersion()
-    {
-        return _minorVersion;
-    }
-
-    public byte getActualMinorVersion()
-    {
-        return _minorVersion > 90 ? (byte) (_minorVersion / 10) : _minorVersion;
-    }
-
-
-    public byte getRevisionVersion()
-    {
-        return _minorVersion > 90 ? (byte) (_minorVersion % 10) : (byte) 0;
-    }
-
-    public String toString()
-    {
-        return _stringFormat;
-    }
-
-
-    public int compareTo(Object o)
-    {
-        ProtocolVersion pv = (ProtocolVersion) o;
-		
-		/* 
-		 * 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(_majorVersion < pv.getMajorVersion())
-        {
-            return -1;
-        }
-        else if(_minorVersion > pv.getMinorVersion())
-        {
-            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;
-	private static final Map<String, ProtocolVersion> _nameToVersionMap =
-	                         new HashMap<String, ProtocolVersion>();
-    private static final ProtocolVersion _defaultVersion;							 
-
-	
-    public static final ProtocolVersion v0_10 = new ProtocolVersion((byte)0,(byte)10);
-
-#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>();
-
-		versions.add(v0_10);
-		_nameToVersionMap.put("0-10", v0_10);
-#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;
-    }
-
-    
-    public static SortedSet<ProtocolVersion> getSupportedProtocolVersions()
-    {
-        return _supportedVersions;
-    }
-    
-    
-
-    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
deleted file mode 100644
index b80d6027b7..0000000000
--- a/java/common/templates/model/ServerMethodDispatcherInterface.vm
+++ /dev/null
@@ -1,56 +0,0 @@
-#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/version/AmqpConstantsClass.vm b/java/common/templates/model/version/AmqpConstantsClass.vm
deleted file mode 100644
index 8d459f2977..0000000000
--- a/java/common/templates/model/version/AmqpConstantsClass.vm
+++ /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/java/common/templates/model/version/ClientMethodDispatcherInterface.vm b/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
deleted file mode 100644
index 80705c1a39..0000000000
--- a/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-#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
deleted file mode 100644
index 8a7b667a91..0000000000
--- a/java/common/templates/model/version/MethodDispatcherInterface.vm
+++ /dev/null
@@ -1,43 +0,0 @@
-#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
deleted file mode 100644
index 277605e34b..0000000000
--- a/java/common/templates/model/version/MethodRegistryClass.vm
+++ /dev/null
@@ -1,193 +0,0 @@
-#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
deleted file mode 100644
index db388fcc65..0000000000
--- a/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-#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