QPID-1463: Andrea's patches

- Added read / write methods on org.apache.qpid.transport.codec.Encoder / org.apache.qpid.transport.codec.Decoder;
- Added the corresponding implementation on org.apache.qpid.transport.codec.BBEncoder / org.apache.qpid.transport.codec.BBDecoder
- Added comments on org.apache.qpid.transport.codec.Encoder / org.apache.qpid.transport.codec.Decoder;
- Removed org.apache.qpid.transport.codec.ManagementEncoder / org.apache.qpid.transport.codec.ManagementDecoder.
- Added 6 data types (Int8, Int16, Int32, Int64, Double and Float);
- Added type mappings with the data types above according to management specifications;
- Removed all references to ManagementEncoder / Decoder classes; Now Qman is using (whenever is possible) Decoder / Encoder and when some specific method is needed then the BBDecoder / BBEncoder is used.
- Some test case adjustment;

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

38 files changed, 155 insertions, 143 deletions

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java
index f9a662ffe7..45962d9cd5 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configurator.java
@@ -41,6 +41,10 @@ import org.apache.qpid.management.domain.handler.impl.SchemaResponseMessageHandl
 import org.apache.qpid.management.domain.model.AccessMode;
 import org.apache.qpid.management.domain.model.type.AbsTime;
 import org.apache.qpid.management.domain.model.type.DeltaTime;
+import org.apache.qpid.management.domain.model.type.Int16;
+import org.apache.qpid.management.domain.model.type.Int32;
+import org.apache.qpid.management.domain.model.type.Int64;
+import org.apache.qpid.management.domain.model.type.Int8;
 import org.apache.qpid.management.domain.model.type.ObjectReference;
 import org.apache.qpid.management.domain.model.type.Str16;
 import org.apache.qpid.management.domain.model.type.Str8;
@@ -228,8 +232,14 @@ public class Configurator extends DefaultHandler
     	configuration.addTypeMapping(new TypeMapping(9,new DeltaTime()));
     	configuration.addTypeMapping(new TypeMapping(10,new ObjectReference()));
     	configuration.addTypeMapping(new TypeMapping(11,new org.apache.qpid.management.domain.model.type.Boolean()));
+    	configuration.addTypeMapping(new TypeMapping(12,new org.apache.qpid.management.domain.model.type.Float(),Names.NUMBER_VALIDATOR));
+    	configuration.addTypeMapping(new TypeMapping(13,new org.apache.qpid.management.domain.model.type.Double(),Names.NUMBER_VALIDATOR));
     	configuration.addTypeMapping(new TypeMapping(14,new org.apache.qpid.management.domain.model.type.Uuid()));
     	configuration.addTypeMapping(new TypeMapping(15,new org.apache.qpid.management.domain.model.type.Map()));
+    	configuration.addTypeMapping(new TypeMapping(16,new Int8(),Names.NUMBER_VALIDATOR));
+    	configuration.addTypeMapping(new TypeMapping(17,new Int16(),Names.NUMBER_VALIDATOR));
+    	configuration.addTypeMapping(new TypeMapping(18,new Int32(),Names.NUMBER_VALIDATOR));
+    	configuration.addTypeMapping(new TypeMapping(19,new Int64(),Names.NUMBER_VALIDATOR));
     }
     
     /**
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
index 21bdea59b5..569a65a782 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/QpidDatasource.java
@@ -99,7 +99,7 @@ public final class QpidDatasource
 
         public void exception(Throwable t)
         {
-            super.exception(t);
+            //super.exception(t);
             _valid = false;
         }
     }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java
index a5b30b382a..be000e9a05 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandler.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.management.domain.handler.base;
 
 import org.apache.qpid.management.domain.model.type.Binary;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 
 /**
  * Base class for content indication message handlers.
@@ -36,7 +36,7 @@ public abstract class ContentIndicationMessageHandler extends BaseMessageHandler
      * @param decoder the decoder used to parse the message.
      * @param sequenceNumber the sequence number of the message.
      */
-    public final void process (ManagementDecoder decoder, int sequenceNumber)
+    public final void process (Decoder decoder, int sequenceNumber)
     {      
         String packageName = decoder.readStr8();
         String className = decoder.readStr8();
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java
index b945a29117..c120334d30 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/base/IMessageHandler.java
@@ -21,7 +21,7 @@
 package org.apache.qpid.management.domain.handler.base;
 
 import org.apache.qpid.management.domain.model.DomainModel;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 
 /**
  * Interface definition for a processor able to deal with a specific message.
@@ -41,7 +41,7 @@ public interface IMessageHandler
      * @param decoder the stream decoder.
      * @param sequenceNumber the sequence number of the message.
      */
-    void process (ManagementDecoder decoder, int sequenceNumber);
+    void process (Decoder decoder, int sequenceNumber);
     
     /**
      * Injects the domain model into this handler.
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/EventContentMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/EventContentMessageHandler.java
index 0a9e8138da..0a590d2836 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/EventContentMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/EventContentMessageHandler.java
@@ -22,7 +22,7 @@ package org.apache.qpid.management.domain.handler.impl;
 

 import org.apache.qpid.management.domain.handler.base.BaseMessageHandler;

 import org.apache.qpid.management.domain.model.type.Binary;

-import org.apache.qpid.transport.codec.ManagementDecoder;

+import org.apache.qpid.transport.codec.Decoder;

 

 /**

  * Base class for content indication message handlers.

@@ -37,7 +37,7 @@ public class EventContentMessageHandler extends BaseMessageHandler
      * @param decoder the decoder used to parse the message.

      * @param sequenceNumber the sequence number of the message.

      */

-    public final void process (ManagementDecoder decoder, int sequenceNumber)

+    public final void process (Decoder decoder, int sequenceNumber)

     {      

         String packageName = decoder.readStr8();

         String eventName = decoder.readStr8();

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/HeartBeatIndicationMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/HeartBeatIndicationMessageHandler.java
index f3bb102926..eda35ea5a5 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/HeartBeatIndicationMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/HeartBeatIndicationMessageHandler.java
@@ -1,7 +1,7 @@
 package org.apache.qpid.management.domain.handler.impl;

 

 import org.apache.qpid.management.domain.handler.base.BaseMessageHandler;

-import org.apache.qpid.transport.codec.ManagementDecoder;

+import org.apache.qpid.transport.codec.Decoder;

 

 /**

  * This is the handler responsible for processing the heartbeat indication response messages.

@@ -11,7 +11,7 @@ import org.apache.qpid.transport.codec.ManagementDecoder;
  */

 public class HeartBeatIndicationMessageHandler extends BaseMessageHandler 

 {

-	public void process(ManagementDecoder decoder, int sequenceNumber) 

+	public void process(Decoder decoder, int sequenceNumber) 

 	{

 		_domainModel.updateLastRefreshDate();

 	}

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java
index 3ca6faa2fd..9c99eb09aa 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/MethodResponseMessageHandler.java
@@ -28,7 +28,7 @@ import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.domain.handler.base.BaseMessageHandler;
 import org.apache.qpid.management.domain.model.DomainModel;
 import org.apache.qpid.management.domain.model.InvocationEvent;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 import org.apache.qpid.transport.util.Logger;
 
 /**
@@ -70,7 +70,7 @@ public class MethodResponseMessageHandler extends BaseMessageHandler
      * @param decoder the decoder used for parsing incoming data.
      * @param sequenceNumber the sequence number of the incoming message.
      */
-    public void process (ManagementDecoder decoder, int sequenceNumber)
+    public void process (Decoder decoder, int sequenceNumber)
     {        
         InvocationResult result = new InvocationResult(decoder.readUint32(), decoder.readStr16(),decoder.readReaminingBytes());
         BlockingQueue<InvocationResult> exchangeChannel = _exchangeChannels.remove(sequenceNumber);
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
index 04357b8eb4..ee5efe2af6 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
@@ -29,7 +29,7 @@ import org.apache.qpid.management.Names;
 import org.apache.qpid.management.Protocol;
 import org.apache.qpid.management.domain.handler.base.BaseMessageHandler;
 import org.apache.qpid.management.domain.model.type.Binary;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 
 /**
  * Schema Response message handler.
@@ -52,7 +52,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
 		 * 
 		 * @param decoder the decoder used for dealing with incoming message.
 		 */
-		void process(ManagementDecoder decoder);
+		void process(Decoder decoder);
 	}
 	
 	/**
@@ -60,7 +60,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
 	 */
 	final IProcessor _classSchemaProcessor = new IProcessor()
 	{
-		public void process(ManagementDecoder decoder) 
+		public void process(Decoder decoder) 
 		{
 	        try 
 	        {	        	
@@ -92,7 +92,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
 	 */
 	final IProcessor _eventSchemaProcessor = new IProcessor()
 	{
-		public void process(ManagementDecoder decoder) 
+		public void process(Decoder decoder) 
 		{
 	        try 
 	        {	        
@@ -120,7 +120,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
      *  @param decoder the decoder used for parsing the incoming stream.
      *  @param sequenceNumber the sequence number of the incoming message.
      */
-    public void process (ManagementDecoder decoder, int sequenceNumber)
+    public void process (Decoder decoder, int sequenceNumber)
     {        
         try 
         {
@@ -155,7 +155,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
      * @param howManyProperties the number of properties to read. 
      * @return a list of maps. Each map contains a property definition.
      */
-    List<Map<String, Object>> getAttributes(ManagementDecoder decoder,int howMany) 
+    List<Map<String, Object>> getAttributes(Decoder decoder,int howMany) 
     {
         List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(howMany);        
         for (int i = 0; i < howMany; i++ )
@@ -172,7 +172,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
      * @param howManyMethods the number of methods to read. 
      * @return a list method definitions.
      */
-    List<MethodOrEventDataTransferObject> getMethods(ManagementDecoder decoder, int howManyMethods)
+    List<MethodOrEventDataTransferObject> getMethods(Decoder decoder, int howManyMethods)
     {
         List<MethodOrEventDataTransferObject> result = new ArrayList<MethodOrEventDataTransferObject>(howManyMethods);
         for (int i  = 0; i < howManyMethods; i++) 
@@ -197,7 +197,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
      * @param howManyEvents the number of events to read. 
      * @return a list event definitions.
      */
-    List<MethodOrEventDataTransferObject> getEvents(ManagementDecoder decoder, int howManyEvents)
+    List<MethodOrEventDataTransferObject> getEvents(Decoder decoder, int howManyEvents)
     {
         List<MethodOrEventDataTransferObject> result = new ArrayList<MethodOrEventDataTransferObject>(howManyEvents);
         for (int i  = 0; i < howManyEvents; i++) 
@@ -214,4 +214,4 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
         }        
         return result;
     }
- }
+ }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java
index db3ddb97e7..1e90479c0b 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidArgument.java
@@ -21,8 +21,7 @@
 package org.apache.qpid.management.domain.model;
 
 import org.apache.qpid.management.Messages;
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Encoder;
 import org.apache.qpid.transport.util.Logger;
 
 class QpidArgument extends QpidProperty
@@ -70,13 +69,13 @@ class QpidArgument extends QpidProperty
             .toString();
     }
 
-    public void encode(Object value,AmqpCoDec encoder) 
+    public void encode(Object value,Encoder encoder) 
     {
         _type.encode(value, encoder);
         LOGGER.debug(Messages.QMAN_200013_ARGUMENT_VALUE_ENCODED,value,_name,_type);
     }
     
-    public Object decode(ManagementDecoder decoder) 
+    public Object decode(org.apache.qpid.transport.codec.Decoder decoder) 
     {
         return _type.decode(decoder);
     }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java
index 69b5cb0565..6712a14075 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidAttribute.java
@@ -22,7 +22,7 @@ package org.apache.qpid.management.domain.model;
 
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.domain.model.type.Type;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 import org.apache.qpid.transport.util.Logger;
 
 /**
@@ -86,7 +86,7 @@ class QpidAttribute extends QpidFeature
      * @param decoder the decoder used to extract the value.
      * @return the value of this feature according to its type definition
      */
-    Object decodeValue(ManagementDecoder decoder)
+    Object decodeValue(Decoder decoder)
     {
         try {
             return _type.decode(decoder);
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java
index 277d9e47a8..c7dfcb033c 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidClass.java
@@ -52,7 +52,7 @@ import org.apache.qpid.management.domain.handler.impl.InvocationResult;
 import org.apache.qpid.management.domain.handler.impl.MethodOrEventDataTransferObject;
 import org.apache.qpid.management.domain.model.type.Binary;
 import org.apache.qpid.management.domain.services.SequenceNumberGenerator;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.BBDecoder;
 import org.apache.qpid.transport.util.Logger;
 
 /**
@@ -693,7 +693,7 @@ class QpidClass extends QpidEntity
      */
     void updateInstanceWithConfigurationData(QpidManagedObject instance,byte [] rawData)
     {
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         decoder.init(ByteBuffer.wrap(rawData));
 
         byte [] presenceBitMasks = decoder.readBytes(_howManyPresenceBitMasks);
@@ -716,7 +716,7 @@ class QpidClass extends QpidEntity
      */
     void updateInstanceWithInstrumentationData(QpidManagedObject instance,byte [] rawData)
     {
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         decoder.init(ByteBuffer.wrap(rawData));
 
         for (QpidStatistic statistic : _schemaOrderedStatistics)
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java
index e6205bba76..273ae650c1 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEvent.java
@@ -40,7 +40,7 @@ import javax.management.RuntimeOperationsException;
 
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.domain.model.type.Binary;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.BBDecoder;
 
 /**
  * Qpid event definition.
@@ -408,7 +408,7 @@ class QpidEvent extends QpidEntity
      */
     void updateEventInstanceWithData(QpidManagedEvent instance)
     {
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         decoder.init(ByteBuffer.wrap(instance._rawEventData));
 
         for (QpidProperty property : _schemaOrderedArguments)
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java
index d1011420ef..7824ecc9a4 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidMethod.java
@@ -26,8 +26,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.BBDecoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 
 /**
@@ -92,7 +92,7 @@ public class QpidMethod extends QpidFeature
      * @param parameters the parameters values.
      * @param encoder the encoder used for encoding.
      */
-    public void encodeParameters (Object[] parameters, AmqpCoDec encoder) 
+    public void encodeParameters (Object[] parameters, Encoder encoder) 
     {
         int index = 0;
         for (QpidArgument argument : arguments)
@@ -113,7 +113,7 @@ public class QpidMethod extends QpidFeature
      */
     public Map<String, Object> decodeParameters (byte [] values) 
     {
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         decoder.init(ByteBuffer.wrap(values));
         Map<String, Object> result = new HashMap<String, Object>();
         
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java
index 6335a553ae..089b00c71c 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidProperty.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Constructor;
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.configuration.Configuration;
 import org.apache.qpid.management.domain.model.type.Type;
-import org.apache.qpid.transport.codec.ManagementDecoder;
 import org.apache.qpid.transport.util.Logger;
 
 /**
@@ -46,7 +45,7 @@ class QpidProperty extends QpidAttribute
      */
     interface Decoder
     {
-        Object decodeValue(ManagementDecoder decoder,byte [] presenceBitMasks); 
+        Object decodeValue(org.apache.qpid.transport.codec.Decoder decoder,byte [] presenceBitMasks); 
     }
     
     /**
@@ -54,7 +53,7 @@ class QpidProperty extends QpidAttribute
      */
     final Decoder _optionalPropertyDecoder = new Decoder() {
 
-        public Object decodeValue (ManagementDecoder decoder, byte[] presenceBitMasks)
+        public Object decodeValue (org.apache.qpid.transport.codec.Decoder decoder, byte[] presenceBitMasks)
         {
             return ((presenceBitMasks[_optionalIndex/8] &  MASKS[_maskIndex]) != 0) 
                 ? QpidProperty.this.decodeValue(decoder) 
@@ -67,7 +66,7 @@ class QpidProperty extends QpidAttribute
      */
     final Decoder _mandatoryPropertyDecoder = new Decoder() {
 
-        public Object decodeValue (ManagementDecoder decoder, byte[] presenceBitMasks)
+        public Object decodeValue (org.apache.qpid.transport.codec.Decoder decoder, byte[] presenceBitMasks)
         {
             return QpidProperty.this.decodeValue(decoder);
         }
@@ -186,7 +185,7 @@ class QpidProperty extends QpidAttribute
      * @param decoder the decoder used to extract the value.
      * @return the value of this feature according to its type definition
      */
-    Object decodeValue(ManagementDecoder decoder,byte [] presenceBitMasks)
+    Object decodeValue(org.apache.qpid.transport.codec.Decoder decoder,byte [] presenceBitMasks)
     {
         return _decoder.decodeValue(decoder, presenceBitMasks);
     }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java
index dd49636a5c..28f5f70c04 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/AbsTime.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class AbsTime extends Type
 {
@@ -31,14 +31,14 @@ public class AbsTime extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
-        return decoder.readUint64();
+        return decoder.readInt64();
     }
 
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack64((Long)value);
+    	encoder.writeInt64((Long)value);
     }  
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
index 02b38d8499..8009150eb2 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.UUID;
 
 import org.apache.qpid.management.messages.AmqpCoDec;
+import org.apache.qpid.transport.codec.Encoder;
 
 /**
  * It is a simple wrapper for a byte array (for example a 128bin).
@@ -117,9 +118,9 @@ public final class Binary implements Serializable
      * 
      * @param encoder the encoder used to encode instance content.
      */
-    public void encode(AmqpCoDec encoder)
+    public void encode(Encoder encoder)
     {
-      encoder.pack(_bytes);  
+    	encoder.writeBin128(_bytes);
     }
     
     @Override
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java
index d9407fd200..c339b870ac 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Boolean.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Boolean extends Type
 {
@@ -31,14 +31,14 @@ public class Boolean extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return (decoder.readUint8() == 1);
     }
 
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack8( ((java.lang.Boolean)value) ? 1 : 0);
+    	encoder.writeUint8( ((java.lang.Boolean)value) ? (short)1 : 0 );
     }
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java
index a05bd3fe58..a788e2f8e1 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/DeltaTime.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class DeltaTime extends Type
 {
@@ -31,14 +31,14 @@ public class DeltaTime extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return decoder.readUint64();
     }
 
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack64((Long)value);
+    	encoder.writeUint64((Long)value);
     }
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java
index 645df0d9ac..cc540ff4da 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Map.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Map extends Type
 {
@@ -31,15 +31,14 @@ public class Map extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return decoder.readMap();
     }
 
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        throw new RuntimeException("encode not yet supported for AMQP Map type.");
-        //encoder.writeMap((java.util.Map<String, Object>)value);
+        encoder.writeMap((java.util.Map<String, Object>)value);
     }
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java
index 3285c3c37e..13e1b68d26 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/ObjectReference.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class ObjectReference extends Type
 {
@@ -31,13 +31,13 @@ public class ObjectReference extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return decoder.readBin128();
     }
 
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
         ((Binary)value).encode(encoder);
     }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java
index 0bffaba9fe..42829ce176 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str16.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Str16 extends Type
 {
@@ -31,14 +31,14 @@ public class Str16 extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return decoder.readStr16();
     }
 
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.packStr16((String)value);
+    	encoder.writeStr16((String)value);
     }
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java
index 730d5b4c78..f9b747ce6d 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Str8.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Str8 extends Type
 {
@@ -31,14 +31,14 @@ public class Str8 extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return  decoder.readStr8();
     }
     
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.packStr8((String)value);
+    	encoder.writeStr8((String)value);
     }
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
index 2242b986e0..c455faaf2c 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 /**
  * Layer supertype for all management "types".
@@ -60,7 +60,7 @@ public abstract class Type
      * @return the "typed" value.
      * 
      */
-    public abstract Object decode(ManagementDecoder decoder);
+    public abstract Object decode(Decoder decoder);
     
     /**
      * Returns a string representation of this type.
@@ -91,5 +91,11 @@ public abstract class Type
         return getClass().hashCode();
     }
 
-    public abstract void encode (Object value, AmqpCoDec encoder);
+    /**
+     * Encodes the given values according to this type definition.
+     * 
+     * @param value the value to be encoded.
+     * @param encoder the encoder.
+     */
+    public abstract void encode (Object value,Encoder encoder);
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java
index 045924157d..2d3edd41ea 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint16.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Uint16 extends Type
 {
@@ -31,14 +31,14 @@ public class Uint16 extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return new Integer(decoder.readUint16());
     }
     
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack16((Integer)value);
+    	encoder.writeUint16((Integer)value);
     }
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java
index dc49695934..c5fb981bb0 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint32.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Uint32 extends Type
 {
@@ -31,14 +31,14 @@ public class Uint32 extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return new Long(decoder.readUint32());
     }
     
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack32(((Number)value).intValue());
+    	encoder.writeUint32((Long)value);
     }    
 }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java
index bd35500400..9182f883bf 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Uint64 extends Type
 {
@@ -31,14 +31,14 @@ public class Uint64 extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return new Long(decoder.readUint64());
     }
     
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack64((Long)value);
+    	encoder.writeUint64((Long)value);
     }    
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java
index c71648ae85..ab7e78856c 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.management.domain.model.type;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Uint8 extends Type
 {
@@ -31,14 +31,14 @@ public class Uint8 extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return new Short(decoder.readUint8());
     }
     
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        encoder.pack8((Short)value);
+    	encoder.writeUint8((Short)value);
     }    
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java
index 3b22449ea4..1b3be954d6 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java
@@ -22,8 +22,8 @@ package org.apache.qpid.management.domain.model.type;
 
 import java.util.UUID;
 
-import org.apache.qpid.management.messages.AmqpCoDec;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
+import org.apache.qpid.transport.codec.Encoder;
 
 public class Uuid extends Type
 {
@@ -33,15 +33,14 @@ public class Uuid extends Type
     }
 
     @Override
-    public Object decode (ManagementDecoder decoder)
+    public Object decode (Decoder decoder)
     {
         return decoder.readUuid();
     }
     
     @Override
-    public void encode (Object value, AmqpCoDec encoder)
+    public void encode (Object value, Encoder encoder)
     {
-        throw new RuntimeException("Not yet implemented encode for UUID type.");
-//        encoder.writeUuid((UUID)value);
+    	encoder.writeUuid((UUID)value);
     }    
 }
\ No newline at end of file
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java
index 135acbd36d..aa588043aa 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java
@@ -33,7 +33,7 @@ import org.apache.qpid.management.Protocol;
 import org.apache.qpid.management.domain.handler.base.IMessageHandler;
 import org.apache.qpid.management.domain.model.DomainModel;
 import org.apache.qpid.nclient.util.MessageListener;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.BBDecoder;
 import org.apache.qpid.transport.util.Logger;
 
 /**
@@ -162,7 +162,7 @@ class BrokerMessageListener implements MessageListener
          IMessageHandler handler = _handlers.get(opcode); 
          if (handler != null) 
          {
-             ManagementDecoder decoder = new ManagementDecoder();
+             BBDecoder decoder = new BBDecoder();
              decoder.init(buffer);
              
              LOGGER.debug(Messages.QMAN_200003_MESSAGE_FORWARDING,opcode,handler);
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java
index 1b5de9663e..cabc568d6f 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java
@@ -9,7 +9,7 @@ import org.apache.qpid.api.Message;
 import org.apache.qpid.management.Messages;

 import org.apache.qpid.management.Protocol;

 import org.apache.qpid.nclient.util.ByteBufferMessage;

-import org.apache.qpid.transport.codec.ManagementDecoder;

+import org.apache.qpid.transport.codec.BBDecoder;

 import org.apache.qpid.transport.util.Logger;

 

 /**

@@ -101,7 +101,7 @@ class MessageTokenizer implements Enumeration<Message>
 		int startIndex = 0;

 		int indexOfMagicNumber = 0;

 		

-		ManagementDecoder decoder = new ManagementDecoder();

+		BBDecoder decoder = new BBDecoder();

 		decoder.init(compoundMessage.readData());

 		byte [] source = decoder.readReaminingBytes();			

 		

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java b/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java
index d797cb0579..2fa20fb456 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java
@@ -29,6 +29,7 @@ import org.apache.qpid.management.domain.services.SequenceNumberGenerator;
 import org.apache.qpid.transport.DeliveryProperties;
 import org.apache.qpid.transport.Header;
 import org.apache.qpid.transport.MessageProperties;
+import org.apache.qpid.transport.codec.BBEncoder;
 
 /**
  * Message implementation used for specific management purposes.
@@ -63,17 +64,18 @@ public abstract class ManagementMessage implements Message
     IDataBuilderStrategy ACCUMULATING = new IDataBuilderStrategy()
     {
         public ByteBuffer getData() {
-            _codec.pack8((byte)opcode());
-            _codec.pack32(sequenceNumber());
+        	_codec.writeInt8((byte)opcode());
+            _codec.writeSequenceNo(sequenceNumber());
             
             specificMessageEncoding();
-            _data =_codec.getEncodedBuffer(); 
+            
+            _data =_codec.segment(); 
             _reader = READING;
             return _data;
         }
     };    
     
-    protected AmqpCoDec _codec;
+    protected BBEncoder _codec;
     protected ByteBuffer _data;
     private int _messageTransferId;
     private IDataBuilderStrategy _reader = ACCUMULATING;    
@@ -83,7 +85,8 @@ public abstract class ManagementMessage implements Message
      */
     ManagementMessage()
     {
-        _codec = new AmqpCoDec();
+        _codec = new BBEncoder(100);
+        _codec.writeMagicNumber();
     }
 
     /**
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java b/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java
index fad42b125c..99916085d6 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java
@@ -150,12 +150,12 @@ public abstract class MethodInvocationRequestMessage extends ManagementMessage
     void specificMessageEncoding ()
     {
         objectId().encode(_codec);
-        _codec.packStr8(packageName());
-        _codec.packStr8(className());
+        _codec.writeStr8(packageName());
+        _codec.writeStr8(className());        
         schemaHash().encode(_codec);
         
         QpidMethod method = method();
-       _codec.packStr8(method.getName());
+        _codec.writeStr8(method.getName());
        method.encodeParameters(parameters(), _codec);
     }
 }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java b/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java
index aa596c8413..9df1733649 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java
@@ -61,8 +61,8 @@ public abstract class SchemaRequestMessage extends ManagementMessage
     @Override
     final void specificMessageEncoding ()
     {
-        _codec.packStr8(packageName());
-        _codec.packStr8(className());
+    	_codec.writeStr8(packageName());
+    	_codec.writeStr8(className());
         schemaHash().encode(_codec);
     }
 }
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
index ca6ae846a8..efd5990bd7 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
@@ -74,11 +74,11 @@ public class ConfigurationTest extends TestCase
     {
         try
         {
-            Configuration.getInstance().getType(TestConstants.VALID_CODE+1);
+            Configuration.getInstance().getType(Integer.MIN_VALUE);
             fail("If an unknwon code is supplied an exception must be thrown.");
         } catch (UnknownTypeCodeException expected)
         {
-            assertEquals(TestConstants.VALID_CODE+1,expected.getCode());
+            assertEquals(Integer.MIN_VALUE,expected.getCode());
         }        
     }
     
@@ -107,11 +107,11 @@ public class ConfigurationTest extends TestCase
     {
         try
         {
-            Configuration.getInstance().getAccessMode(TestConstants.VALID_CODE+1);
+            Configuration.getInstance().getAccessMode(Integer.MIN_VALUE);
             fail("If an unknwon code is supplied an exception must be thrown.");
         } catch (UnknownAccessCodeException expected)
         {
-            assertEquals(TestConstants.VALID_CODE+1,expected.getCode());
+            assertEquals(Integer.MIN_VALUE,expected.getCode());
         }        
     }    
     
@@ -199,7 +199,6 @@ public class ConfigurationTest extends TestCase
         
         Map<Character, IMessageHandler> handlerMappings = Configuration.getInstance().getManagementQueueHandlers();
         
-        assertEquals(2,handlerMappings.size());
         assertEquals(instrMessageHandlerClassName,handlerMappings.get(instrMapping.getOpcode()).getClass().getName());
         assertEquals(configMessageHandlerClassName,handlerMappings.get(configMapping.getOpcode()).getClass().getName());        
     }
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
index 3ed9ed8a61..c528392a93 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
  * 
  * @author Andrea Gazzarini
  */
-public class BaseDomainModelTestCase extends TestCase
+public abstract class BaseDomainModelTestCase extends TestCase
 {
     /**
      * Set up fixture for this test case.
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
index a4e1e24ff3..553c1c21de 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
@@ -27,7 +27,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.qpid.management.domain.model.type.Uint64;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.BBDecoder;
 
 public class OptionalPropertiesTest extends TestCase
 {
@@ -60,7 +60,7 @@ public class OptionalPropertiesTest extends TestCase
         QpidProperty property = new QpidProperty();
         
         // We don't need a decoder so in order to be sure that it won't be invoked set it to null.
-        ManagementDecoder nullDecoder = null;
+        BBDecoder nullDecoder = null;
         
         for (int i = 0; i < 8; i++)
         {
@@ -92,7 +92,7 @@ public class OptionalPropertiesTest extends TestCase
         ByteBuffer buffer = ByteBuffer.allocate(8);
         buffer.putLong(_44);
         buffer.rewind();
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         
         decoder.init(buffer);
         assertEquals(_44,property.decodeValue(decoder, presenceBytes));
@@ -164,7 +164,7 @@ public class OptionalPropertiesTest extends TestCase
             }
         }
         buffer.rewind();
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         
         decoder.init(buffer);
         int index = 0;
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java
index c489f7d767..805c039a6f 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java
@@ -32,7 +32,7 @@ import org.apache.qpid.management.TestConstants;
 import org.apache.qpid.management.domain.handler.base.IMessageHandler;
 import org.apache.qpid.management.domain.model.DomainModel;
 import org.apache.qpid.nclient.util.ByteBufferMessage;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 
 /**
  * Test case for Broker Message Listener.
@@ -44,7 +44,7 @@ public class BrokerMessageListenerTest extends TestCase
     // An empty message handler user for test.
     private IMessageHandler _emptyMessageHandler = new IMessageHandler() 
     {
-        public void process (ManagementDecoder decoder, int sequenceNumber)
+        public void process (Decoder decoder, int sequenceNumber)
         {
         }
         public void setDomainModel (DomainModel domainModel) 
@@ -55,7 +55,7 @@ public class BrokerMessageListenerTest extends TestCase
     // Another empty message handler user for test.
     private IMessageHandler _anotherEmptyMessageHandler = new IMessageHandler() 
     {
-        public void process (ManagementDecoder decoder, int sequenceNumber)
+        public void process (Decoder decoder, int sequenceNumber)
         {
         }
         public void setDomainModel (DomainModel domainModel)
@@ -111,7 +111,7 @@ public class BrokerMessageListenerTest extends TestCase
         IMessageHandler wrongMessageHandler = new IMessageHandler()
         {
 
-            public void process (ManagementDecoder decoder, int sequenceNumber)
+            public void process (Decoder decoder, int sequenceNumber)
             {
             }
 
@@ -148,7 +148,7 @@ public class BrokerMessageListenerTest extends TestCase
         IMessageHandler neverCallMe = new IMessageHandler()
         {
 
-            public void process (ManagementDecoder decoder, int sequenceNumber)
+            public void process (Decoder decoder, int sequenceNumber)
             {
                 fail("This test shouldn't never arrive at this point...");
             }
@@ -189,7 +189,7 @@ public class BrokerMessageListenerTest extends TestCase
     			this._opcode = opcode;
 			}
     		
-            public void process (ManagementDecoder decoder, int sequenceNumber)
+            public void process (Decoder decoder, int sequenceNumber)
             {
             	handlersMap.remove(_opcode);
             }
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java
index 5da3db2933..66ed7cdc18 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java
@@ -2,16 +2,13 @@ package org.apache.qpid.management.domain.services;
 

 import java.io.IOException;

 import java.nio.ByteBuffer;

-import java.util.ArrayList;

-import java.util.Arrays;

 import java.util.*;

-import java.util.Random;

 

 import junit.framework.TestCase;

 

 import org.apache.qpid.api.Message;

 import org.apache.qpid.nclient.util.ByteBufferMessage;

-import org.apache.qpid.transport.codec.ManagementDecoder;

+import org.apache.qpid.transport.codec.BBDecoder;

 

 /**

  * Tests case for messaeg tokenizer.

@@ -114,7 +111,7 @@ public class MessageTokenizerTest extends TestCase {
 	private void assertEquals(Message message, byte [] expected) throws IOException 

 	{

 		ByteBuffer messageContent = message.readData();

-		ManagementDecoder decoder = new ManagementDecoder();

+		BBDecoder decoder = new BBDecoder();

 		decoder.init(messageContent);

 		byte [] content = decoder.readReaminingBytes();	

 		assertTrue(Arrays.equals(content, expected));