QPID-3923, QPID-3998: split out the IDs used for QMF (which have a different format) from those for the new config model, make it clearer which is being used where

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

38 files changed, 217 insertions, 168 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 3eeac71ebf..a812436f34 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -945,7 +945,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
         if (_stateManager.isInState(State.ACTIVE))
         {
             DatabaseEntry key = new DatabaseEntry();
-            UUIDTupleBinding.getInstance().objectToEntry(link.getId(), key);
+            UUIDTupleBinding.getInstance().objectToEntry(link.getQMFId(), key);
 
             DatabaseEntry value = new DatabaseEntry();
             LongBinding.longToEntry(link.getCreateTime(), value);
@@ -966,7 +966,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
     public void deleteBrokerLink(final BrokerLink link) throws AMQStoreException
     {
         DatabaseEntry key = new DatabaseEntry();
-        UUIDTupleBinding.getInstance().objectToEntry(link.getId(), key);
+        UUIDTupleBinding.getInstance().objectToEntry(link.getQMFId(), key);
         try
         {
             OperationStatus status = _linkDb.delete(null, key);
@@ -986,10 +986,10 @@ public abstract class AbstractBDBMessageStore implements MessageStore
         if (_stateManager.isInState(State.ACTIVE))
         {
             DatabaseEntry key = new DatabaseEntry();
-            UUIDTupleBinding.getInstance().objectToEntry(bridge.getId(), key);
+            UUIDTupleBinding.getInstance().objectToEntry(bridge.getQMFId(), key);
 
             DatabaseEntry value = new DatabaseEntry();
-            UUIDTupleBinding.getInstance().objectToEntry(bridge.getLink().getId(),value);
+            UUIDTupleBinding.getInstance().objectToEntry(bridge.getLink().getQMFId(),value);
             LongBinding.longToEntry(bridge.getCreateTime(),value);
             StringMapBinding.getInstance().objectToEntry(bridge.getArguments(), value);
 
@@ -1009,7 +1009,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
     public void deleteBridge(final Bridge bridge) throws AMQStoreException
     {
         DatabaseEntry key = new DatabaseEntry();
-        UUIDTupleBinding.getInstance().objectToEntry(bridge.getId(), key);
+        UUIDTupleBinding.getInstance().objectToEntry(bridge.getQMFId(), key);
         try
         {
             OperationStatus status = _bridgeDb.delete(null, key);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
index f6ceae6c0e..27ab580642 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
@@ -70,6 +70,7 @@ public class ManagementExchange implements Exchange, QMFService.Listener
 
     private final Set<Binding> _bindingSet = new CopyOnWriteArraySet<Binding>();
     private UUID _id;
+    private UUID _qmfId;
     private static final String AGENT_BANK = "0";
 
     private int _bindingCountHigh;
@@ -196,6 +197,7 @@ public class ManagementExchange implements Exchange, QMFService.Listener
         _virtualHost = host;
         _id = id;
         _virtualHost.scheduleHouseKeepingTask(_virtualHost.getBroker().getManagementPublishInterval(), new UpdateTask(_virtualHost));
+        _qmfId = getConfigStore().createId();
         getConfigStore().addConfiguredObject(this);
         getQMFService().addListener(this);
     }
@@ -205,6 +207,12 @@ public class ManagementExchange implements Exchange, QMFService.Listener
         return _id;
     }
 
+    @Override
+    public UUID getQMFId()
+    {
+        return _qmfId;
+    }
+
     public ExchangeConfigType getConfigType()
     {
         return ExchangeConfigType.getInstance();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
index 631bd3c7cc..c3604dca44 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
@@ -28,7 +28,7 @@ public abstract class QMFObject<C extends QMFClass, D extends QMFObject.Delegate
 
     public interface Delegate
     {
-        UUID getId();
+        UUID getQMFId();
         long getCreateTime();
     }
 
@@ -49,7 +49,7 @@ public abstract class QMFObject<C extends QMFClass, D extends QMFObject.Delegate
 
     public final UUID getId()
     {
-        return _delegate.getId();
+        return _delegate.getQMFId();
     }
 
     public final long getCreateTime()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
index 84487d314f..d713976919 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
@@ -436,7 +436,7 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             QMFObject qmfObject = classObjects.remove(object);
             if(qmfObject != null)
             {
-                _managedObjectsById.get(qmfClass).remove(object.getId());
+                _managedObjectsById.get(qmfClass).remove(object.getQMFId());
                 objectRemoved(qmfObject);
             }
         }
@@ -468,7 +468,7 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             }
         }
 
-        classObjectsById.put(object.getId(),qmfObject);
+        classObjectsById.put(object.getQMFId(),qmfObject);
 
         if(classObjects.putIfAbsent(object, qmfObject) == null)
         {
@@ -570,7 +570,7 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
 
         public UUID getSystemId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public String getOsName()
@@ -598,9 +598,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getOSArchitecture();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -964,9 +964,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return factory.createResponseCommand(CompletionCode.NOT_IMPLEMENTED);
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1004,9 +1004,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getFederationTag();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1135,9 +1135,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getByteRoutes();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1470,9 +1470,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getArguments();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1526,9 +1526,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getMatches();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1647,9 +1647,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return factory.createResponseCommand();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1805,9 +1805,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return factory.createResponseCommand();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1876,9 +1876,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return _obj.getDelivered();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -1972,9 +1972,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return null;
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
@@ -2066,9 +2066,9 @@ public class QMFService implements ConfigStore.ConfigEventListener, Closeable
             return factory.createResponseCommand();
         }
 
-        public UUID getId()
+        public UUID getQMFId()
         {
-            return _obj.getId();
+            return _obj.getQMFId();
         }
 
         public long getCreateTime()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 030fd3f499..abbde1d6b8 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -169,7 +169,7 @@ public class AMQChannel implements SessionConfig, AMQSessionModel, AsyncAutoComm
     private List<QueueEntry> _resendList = new ArrayList<QueueEntry>();
     private static final
     AMQShortString IMMEDIATE_DELIVERY_REPLY_TEXT = new AMQShortString("Immediate delivery is not possible.");
-    private final UUID _id;
+    private final UUID _qmfId;
     private long _createTime = System.currentTimeMillis();
 
     private final ClientDeliveryMethod _clientDeliveryMethod;
@@ -182,7 +182,7 @@ public class AMQChannel implements SessionConfig, AMQSessionModel, AsyncAutoComm
 
         _actor = new AMQPChannelActor(this, session.getLogActor().getRootMessageLogger());
         _logSubject = new ChannelLogSubject(this);
-        _id = getConfigStore().createId();
+        _qmfId = getConfigStore().createId();
         _actor.message(ChannelMessages.CREATE());
 
         getConfigStore().addConfiguredObject(this);
@@ -1491,9 +1491,10 @@ public class AMQChannel implements SessionConfig, AMQSessionModel, AsyncAutoComm
         return false;
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public String getSessionName()
@@ -1659,6 +1660,6 @@ public class AMQChannel implements SessionConfig, AMQSessionModel, AsyncAutoComm
 
     public int compareTo(AMQSessionModel session)
     {
-        return getId().compareTo(session.getId());
+        return getQMFId().compareTo(session.getQMFId());
     }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
index 2efd4cee26..9b3be624e0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
@@ -35,11 +35,13 @@ public class Binding
     private final Exchange _exchange;
     private final Map<String, Object> _arguments;
     private final UUID _id;
+    private final UUID _qmfId;
     private final AtomicLong _matches = new AtomicLong();
 
-    public Binding(UUID id, final String bindingKey, final AMQQueue queue, final Exchange exchange, final Map<String, Object> arguments)
+    public Binding(UUID id, UUID qmfId, final String bindingKey, final AMQQueue queue, final Exchange exchange, final Map<String, Object> arguments)
     {
         _id = id;
+        _qmfId = qmfId;
         _bindingKey = bindingKey;
         _queue = queue;
         _exchange = exchange;
@@ -51,6 +53,11 @@ public class Binding
         return _id;
     }
 
+    public UUID getQMFId()
+    {
+        return _qmfId;
+    }
+
     public String getBindingKey()
     {
         return _bindingKey;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
index 4161b65db7..b805056311 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
@@ -60,7 +60,7 @@ public class BindingFactory
 
         private BindingImpl(UUID id, String bindingKey, final AMQQueue queue, final Exchange exchange, final Map<String, Object> arguments)
         {
-            super(id, bindingKey, queue, exchange, arguments);
+            super(id, queue.getVirtualHost().getConfigStore().createId(), bindingKey, queue, exchange, arguments);
             _logSubject = new BindingLogSubject(bindingKey,exchange,queue);
 
         }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
index aff07250f3..c519a0c0fa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
@@ -101,7 +101,7 @@ public class ConfigStore
 
         }
 
-        typeMap.put(object.getId(), object);
+        typeMap.put(object.getQMFId(), object);
         sendEvent(Event.CREATED, object);
     }
 
@@ -111,7 +111,7 @@ public class ConfigStore
         ConcurrentHashMap typeMap = _typeMap.get(object.getConfigType());
         if(typeMap != null)
         {
-            typeMap.remove(object.getId());
+            typeMap.remove(object.getQMFId());
             sendEvent(Event.DELETED, object);
         }
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
index 78666a3f93..ff4e38d9f7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
@@ -25,7 +25,7 @@ import java.util.UUID;
 
 public interface ConfiguredObject<T extends ConfigObjectType<T,C>, C extends ConfiguredObject<T, C>>
 {
-    public UUID getId();
+    public UUID getQMFId();
 
     public T getConfigType();
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
index 98109ce1e8..80c2e8b2f1 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
@@ -33,7 +33,7 @@ public class SystemConfigImpl implements SystemConfig
     private static final String OS_ARCH = System.getProperty("os.arch");
     private static final String OS_VERSION = System.getProperty("os.version");
 
-    private final UUID _id;
+    private final UUID _qmfId;
     private String _name;
 
     private final String _host;
@@ -48,9 +48,9 @@ public class SystemConfigImpl implements SystemConfig
         this(store.createId(), store);
     }
 
-    public SystemConfigImpl(UUID id, ConfigStore store)
+    public SystemConfigImpl(UUID qmfId, ConfigStore store)
     {
-        _id = id;
+        _qmfId = qmfId;
         _store = store;
         String host;
         try
@@ -95,9 +95,10 @@ public class SystemConfigImpl implements SystemConfig
         return OS_ARCH;
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public SystemConfigType getConfigType()
@@ -119,12 +120,12 @@ public class SystemConfigImpl implements SystemConfig
     {
         broker.setSystem(this);
         _store.addConfiguredObject(broker);
-        _brokers.put(broker.getId(), broker);
+        _brokers.put(broker.getQMFId(), broker);
     }
 
     public void removeBroker(final BrokerConfig broker)
     {
-        _brokers.remove(broker.getId());
+        _brokers.remove(broker.getQMFId());
         _store.removeConfiguredObject(broker);
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
index d7c36da4e0..4a383cce7a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
@@ -65,7 +65,7 @@ public final class SystemConfigType extends ConfigObjectType<SystemConfigType, S
     {
         public UUID getValue(SystemConfig object)
         {
-            return object.getId();
+            return object.getQMFId();
         }
     };
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index e633ddd341..512a8c6996 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -86,6 +86,8 @@ public abstract class AbstractExchange implements Exchange
     //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
 
+    private UUID _qmfId;
+
     public AbstractExchange(final ExchangeType<? extends Exchange> type)
     {
         _type = type;
@@ -111,7 +113,7 @@ public abstract class AbstractExchange implements Exchange
         _ticket = ticket;
 
         _id = id;
-
+        _qmfId = getConfigStore().createId();
         getConfigStore().addConfiguredObject(this);
         _logSubject = new ExchangeLogSubject(this, this.getVirtualHost());
 
@@ -296,6 +298,12 @@ public abstract class AbstractExchange implements Exchange
         return _id;
     }
 
+    @Override
+    public UUID getQMFId()
+    {
+        return _qmfId;
+    }
+
     public ExchangeConfigType getConfigType()
     {
         return ExchangeConfigType.getInstance();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
index 289cb1a923..762686e68d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
@@ -147,4 +147,6 @@ public interface Exchange extends ExchangeReferrer, ExchangeConfig
     {
         public void onClose(Exchange exchange) throws AMQSecurityException, AMQInternalException;
     }
+
+    UUID getId();
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
index 480d4e4215..0ce16bd3f7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
@@ -291,7 +291,7 @@ public class TopicExchange extends AbstractExchange
 
     public boolean isBound(AMQShortString routingKey, FieldTable arguments, AMQQueue queue)
     {
-        Binding binding = new Binding(null, routingKey.toString(), queue, this, FieldTable.convertToMap(arguments));
+        Binding binding = new Binding(null, null, routingKey.toString(), queue, this, FieldTable.convertToMap(arguments));
         
         if (arguments == null)
         {
@@ -314,7 +314,7 @@ public class TopicExchange extends AbstractExchange
 
     public boolean isBound(String bindingKey, Map<String, Object> arguments, AMQQueue queue)
     {
-        Binding binding = new Binding(null, bindingKey, queue, this, arguments);
+        Binding binding = new Binding(null, null, bindingKey, queue, this, arguments);
         if (arguments == null)
         {
             return _bindings.containsKey(binding);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
index c7046f8e53..7eb476b15a 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
@@ -91,7 +91,7 @@ public class Bridge implements BridgeConfig
     private final String _tag;
     private final String _excludes;
     private final BrokerLink _link;
-    private UUID _id;
+    private UUID _qmfId;
     private long _createTime = System.currentTimeMillis();
 
     private Session _session;
@@ -124,7 +124,7 @@ public class Bridge implements BridgeConfig
         _key = key;
         _tag = tag;
         _excludes = excludes;
-        _id = durable ? brokerLink.getConfigStore().createPersistentId() : brokerLink.getConfigStore().createId();
+        _qmfId = durable ? brokerLink.getConfigStore().createPersistentId() : brokerLink.getConfigStore().createId();
 
         _transaction = new AutoCommitTransaction(getVirtualHost().getMessageStore());
 
@@ -198,7 +198,7 @@ public class Bridge implements BridgeConfig
     {
         _link = brokerLink;
         _bridgeNo = bridgeNo;
-        _id = id;
+        _qmfId = id;
         brokerLink.getConfigStore().persistentIdInUse(id);
         _createTime = createTime;
 
@@ -249,9 +249,10 @@ public class Bridge implements BridgeConfig
         return Collections.unmodifiableMap(arguments);
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public BridgeConfigType getConfigType()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
index 4bcc0d6136..1ef57c53cb 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
@@ -89,7 +89,7 @@ public class BrokerLink implements LinkConfig, ConnectionListener
     private final String _username;
     private final String _password;
     private final VirtualHost _virtualHost;
-    private UUID _id;
+    private UUID _qmfId;
     private AtomicBoolean _closing = new AtomicBoolean();
     private final long _createTime;
     private Connection _qpidConnection;
@@ -133,7 +133,7 @@ public class BrokerLink implements LinkConfig, ConnectionListener
     private class ConnectionConfigAdapter implements ConnectionConfig
     {
         private long _adapterCreateTime = System.currentTimeMillis();
-        private UUID _id = BrokerLink.this.getConfigStore().createId();
+        private UUID _qmfId = BrokerLink.this.getConfigStore().createId();
 
         public VirtualHost getVirtualHost()
         {
@@ -185,9 +185,10 @@ public class BrokerLink implements LinkConfig, ConnectionListener
             return getVirtualHost().getConfigStore();
         }
 
-        public UUID getId()
+        @Override
+        public UUID getQMFId()
         {
-            return _id;
+            return _qmfId;
         }
 
         public ConnectionConfigType getConfigType()
@@ -230,11 +231,11 @@ public class BrokerLink implements LinkConfig, ConnectionListener
         }
     };
 
-    public BrokerLink(final VirtualHost virtualHost, UUID id, long createTime, Map<String, String> arguments)
+    public BrokerLink(final VirtualHost virtualHost, UUID qmfId, long createTime, Map<String, String> arguments)
     {
         _virtualHost = virtualHost;
-        _id = id;
-        virtualHost.getConfigStore().persistentIdInUse(id);
+        _qmfId = qmfId;
+        virtualHost.getConfigStore().persistentIdInUse(qmfId);
         _createTime = createTime;
         _transport = arguments.get(TRANSPORT);
 
@@ -289,7 +290,7 @@ public class BrokerLink implements LinkConfig, ConnectionListener
         _authMechanism = authMechanism;
         _username = username;
         _password = password;
-        _id = durable ? virtualHost.getConfigStore().createPersistentId() : virtualHost.getConfigStore().createId();
+        _qmfId = durable ? virtualHost.getConfigStore().createPersistentId() : virtualHost.getConfigStore().createId();
 
         if(durable)
         {
@@ -457,9 +458,10 @@ public class BrokerLink implements LinkConfig, ConnectionListener
         return _remoteVhost;
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public LinkConfigType getConfigType()
@@ -672,7 +674,7 @@ public class BrokerLink implements LinkConfig, ConnectionListener
     public String toString()
     {
         return "BrokerLink{" +
-               " _id=" + _id +
+               " _id=" + _qmfId +
                ", _transport='" + _transport + '\'' +
                ", _host='" + _host + '\'' +
                ", _port=" + _port +
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
index 69ba7279bc..36fafba1cd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
@@ -31,13 +31,6 @@ import java.util.UUID;
 public interface AMQConnectionModel extends StatisticsGatherer
 {
     /**
-     * get a unique id for this connection.
-     *
-     * @return a {@link UUID} representing the connection
-     */
-    public UUID getId();
-
-    /**
      * Close the underlying Connection
      *
      * @param cause
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 850e293c3b..cec7ff9625 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
@@ -139,7 +139,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
 
     private long _maxFrameSize;
     private final AtomicBoolean _closing = new AtomicBoolean(false);
-    private final UUID _id;
+    private final UUID _qmfId;
     private final ConfigStore _configStore;
     private long _createTime = System.currentTimeMillis();
 
@@ -165,7 +165,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         _logSubject = new ConnectionLogSubject(this);
 
         _configStore = virtualHostRegistry.getConfigStore();
-        _id = _configStore.createId();
+        _qmfId = _configStore.createId();
 
         _actor.message(ConnectionMessages.OPEN(null, null, null, false, false, false));
 
@@ -1190,9 +1190,10 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         return false;
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public long getConnectionId()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
index efc64d9d91..d18353682b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
@@ -37,7 +37,7 @@ import org.apache.qpid.server.queue.SimpleAMQQueue;
 public interface AMQSessionModel extends Comparable<AMQSessionModel>
 {
     /** Unique session ID across entire broker*/
-    public UUID getId();
+    public UUID getQMFId();
 
     public AMQConnectionModel getConnectionModel();
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
index 0312db5dde..fd6e9300ec 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
@@ -47,7 +47,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
     private long _readBytes;
     private long _writtenBytes;
     private ServerConnection _connection;
-    private final UUID _id;
+    private final UUID _qmfId;
     private final IApplicationRegistry _appRegistry;
     private long _createTime = System.currentTimeMillis();
 
@@ -59,7 +59,7 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
         _connection = conn;
         _connection.setConnectionConfig(this);
 
-        _id = appRegistry.getConfigStore().createId();
+        _qmfId = appRegistry.getConfigStore().createId();
         _appRegistry = appRegistry;
 
         if(network != null)
@@ -180,9 +180,10 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
         return _appRegistry.getConfigStore();
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public ConnectionConfigType getConfigType()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 242ad24048..d42bd6cf03 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -185,6 +185,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
 
     //TODO : persist creation time
     private long _createTime = System.currentTimeMillis();
+    private UUID _qmfId;
     private ConfigurationPlugin _queueConfiguration;
 
     /** the maximum delivery count for each message on this queue or 0 if maximum delivery count is not to be enforced. */
@@ -242,7 +243,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
         _arguments = arguments == null ? new HashMap<String, Object>() : new HashMap<String, Object>(arguments);
 
         _id = id;
-
+        _qmfId = getConfigStore().createId();
         _asyncDelivery = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
 
         _logSubject = new QueueLogSubject(this);
@@ -330,6 +331,12 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
         return _id;
     }
 
+    @Override
+    public UUID getQMFId()
+    {
+        return _qmfId;
+    }
+
     public QueueConfigType getConfigType()
     {
         return QueueConfigType.getInstance();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
index db436b99e8..950a090b43 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
@@ -44,13 +44,13 @@ public class BrokerConfigAdapter implements BrokerConfig
 
     private final Map<UUID, VirtualHostConfig> _vhosts = new ConcurrentHashMap<UUID, VirtualHostConfig>();
     private final long _createTime = System.currentTimeMillis();
-    private UUID _id;
+    private UUID _qmfId;
     private String _federationTag;
 
     public BrokerConfigAdapter(final IApplicationRegistry instance)
     {
         _instance = instance;
-        _id = instance.getConfigStore().createId();
+        _qmfId = instance.getConfigStore().createId();
         _federationTag = UUID.randomUUID().toString();
     }
 
@@ -114,7 +114,7 @@ public class BrokerConfigAdapter implements BrokerConfig
 
     public void addVirtualHost(final VirtualHostConfig virtualHost)
     {
-        _vhosts.put(virtualHost.getId(), virtualHost);
+        _vhosts.put(virtualHost.getQMFId(), virtualHost);
         getConfigStore().addConfiguredObject(virtualHost);
 
     }
@@ -141,9 +141,10 @@ public class BrokerConfigAdapter implements BrokerConfig
         vhost.createBrokerConnection(transport, host, port, "", durable, authMechanism, username, password);
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public BrokerConfigType getConfigType()
@@ -184,7 +185,7 @@ public class BrokerConfigAdapter implements BrokerConfig
     public String toString()
     {
         return "BrokerConfigAdapter{" +
-               "_id=" + _id +
+               "_id=" + _qmfId +
                ", _system=" + _system +
                ", _vhosts=" + _vhosts +
                ", _createTime=" + _createTime +
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
index 281522c0ef..36ac8b3d40 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
@@ -990,8 +990,8 @@ public class DerbyMessageStore implements MessageStore
                 try
                 {
 
-                    stmt.setLong(1, link.getId().getLeastSignificantBits());
-                    stmt.setLong(2, link.getId().getMostSignificantBits());
+                    stmt.setLong(1, link.getQMFId().getLeastSignificantBits());
+                    stmt.setLong(2, link.getQMFId().getMostSignificantBits());
                     ResultSet rs = stmt.executeQuery();
                     try
                     {
@@ -1004,8 +1004,8 @@ public class DerbyMessageStore implements MessageStore
                             try
                             {
 
-                                insertStmt.setLong(1, link.getId().getLeastSignificantBits());
-                                insertStmt.setLong(2, link.getId().getMostSignificantBits());
+                                insertStmt.setLong(1, link.getQMFId().getLeastSignificantBits());
+                                insertStmt.setLong(2, link.getQMFId().getMostSignificantBits());
                                 insertStmt.setLong(3, link.getCreateTime());
 
                                 byte[] argumentBytes = convertStringMapToBytes(link.getArguments());
@@ -1082,8 +1082,8 @@ public class DerbyMessageStore implements MessageStore
         {
             conn = newAutoCommitConnection();
             stmt = conn.prepareStatement(DELETE_FROM_LINKS);
-            stmt.setLong(1, link.getId().getLeastSignificantBits());
-            stmt.setLong(2, link.getId().getMostSignificantBits());
+            stmt.setLong(1, link.getQMFId().getLeastSignificantBits());
+            stmt.setLong(2, link.getQMFId().getMostSignificantBits());
             int results = stmt.executeUpdate();
 
             if (results == 0)
@@ -1119,7 +1119,7 @@ public class DerbyMessageStore implements MessageStore
                 try
                 {
 
-                    UUID id = bridge.getId();
+                    UUID id = bridge.getQMFId();
                     stmt.setLong(1, id.getLeastSignificantBits());
                     stmt.setLong(2, id.getMostSignificantBits());
                     ResultSet rs = stmt.executeQuery();
@@ -1139,7 +1139,7 @@ public class DerbyMessageStore implements MessageStore
 
                                 insertStmt.setLong(3, bridge.getCreateTime());
 
-                                UUID linkId = bridge.getLink().getId();
+                                UUID linkId = bridge.getLink().getQMFId();
                                 insertStmt.setLong(4, linkId.getLeastSignificantBits());
                                 insertStmt.setLong(5, linkId.getMostSignificantBits());
 
@@ -1185,8 +1185,8 @@ public class DerbyMessageStore implements MessageStore
         {
             conn = newAutoCommitConnection();
             stmt = conn.prepareStatement(DELETE_FROM_BRIDGES);
-            stmt.setLong(1, bridge.getId().getLeastSignificantBits());
-            stmt.setLong(2, bridge.getId().getMostSignificantBits());
+            stmt.setLong(1, bridge.getQMFId().getLeastSignificantBits());
+            stmt.setLong(2, bridge.getQMFId().getMostSignificantBits());
             int results = stmt.executeUpdate();
 
             if (results == 0)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
index 0d648862b1..c92853e400 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
@@ -91,7 +91,7 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
     private final long _subscriptionID;
     private LogSubject _logSubject;
     private LogActor _logActor;
-    private UUID _id;
+    private UUID _qmfId;
     private final AtomicLong _deliveredCount = new AtomicLong(0);
     private final AtomicLong _deliveredBytes = new AtomicLong(0);
 
@@ -391,7 +391,7 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
         }
         _queue = queue;
 
-        _id = getConfigStore().createId();
+        _qmfId = getConfigStore().createId();
         getConfigStore().addConfiguredObject(this);
 
         _logSubject = new SubscriptionLogSubject(this);
@@ -767,9 +767,10 @@ public abstract class SubscriptionImpl implements Subscription, FlowCreditManage
         return true;
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public boolean isDurable()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
index df648b88ae..dfd9315226 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
@@ -125,7 +125,7 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
 
     private LogActor _logActor;
     private final Map<String, Object> _properties = new ConcurrentHashMap<String, Object>();
-    private UUID _id;
+    private UUID _qmfId;
     private String _traceExclude;
     private String _trace;
     private final long _createTime = System.currentTimeMillis();
@@ -192,7 +192,7 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
         Map<String, Object> arguments = queue.getArguments();
         _traceExclude = (String) arguments.get("qpid.trace.exclude");
         _trace = (String) arguments.get("qpid.trace.id");
-        _id = getConfigStore().createId();
+        _qmfId = getConfigStore().createId();
         getConfigStore().addConfiguredObject(this);
         String filterLogString = null;
 
@@ -1011,9 +1011,10 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr
         return _flowMode.toString();
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     public String getName()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
index e07464c52c..f21026794f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
@@ -75,11 +75,6 @@ public class ServerConnection extends Connection implements AMQConnectionModel,
         _connectionId = connectionId;
     }
 
-    public UUID getId()
-    {
-        return _config.getId();
-    }
-
     public Object getReference()
     {
         return _reference;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
index 9914485638..f0ba5646e0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
@@ -680,7 +680,8 @@ public class ServerSession extends Session
         return (VirtualHost) _connectionConfig.getVirtualHost();
     }
 
-    public UUID getId()
+    @Override
+    public UUID getQMFId()
     {
         return _id;
     }
@@ -1067,6 +1068,6 @@ public class ServerSession extends Session
 
     public int compareTo(AMQSessionModel session)
     {
-        return getId().compareTo(session.getId());
+        return getQMFId().compareTo(session.getQMFId());
     }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
index dcc5acb820..f810360662 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
@@ -63,6 +63,8 @@ public interface VirtualHost extends DurableConfigurationStore.Source, VirtualHo
 
     UUID getBrokerId();
 
+    UUID getId();
+
     void scheduleHouseKeepingTask(long period, HouseKeepingTask task);
 
     long getHouseKeepingTaskCount();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
index 9ddb01d34c..d9dc0aa64e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
@@ -53,6 +53,7 @@ import org.apache.qpid.server.federation.BrokerLink;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.VirtualHostMessages;
 import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
+import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
@@ -78,10 +79,12 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr
 
     private static final int HOUSEKEEPING_SHUTDOWN_TIMEOUT = 5;
 
-    private final UUID _id;
+    private final UUID _qmfId;
 
     private final String _name;
 
+    private final UUID _id;
+
     private final long _createTime = System.currentTimeMillis();
 
     private final ConcurrentHashMap<BrokerLink,BrokerLink> _links = new ConcurrentHashMap<BrokerLink, BrokerLink>();
@@ -135,7 +138,8 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr
         _name = _vhostConfig.getName();
         _dtxRegistry = new DtxRegistry();
 
-        _id = _appRegistry.getConfigStore().createId();
+        _qmfId = _appRegistry.getConfigStore().createId();
+        _id = UUIDGenerator.generateVhostUUID(_name);
 
         CurrentActor.get().message(VirtualHostMessages.CREATED(_name));
 
@@ -183,6 +187,12 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr
         return _id;
     }
 
+    @Override
+    public UUID getQMFId()
+    {
+        return _qmfId;
+    }
+
     public VirtualHostConfigType getConfigType()
     {
         return VirtualHostConfigType.getInstance();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/MockConnectionConfig.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/MockConnectionConfig.java
index c0777d2f8f..00e5cd1222 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/MockConnectionConfig.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/MockConnectionConfig.java
@@ -25,14 +25,14 @@ import java.util.UUID;
 public class MockConnectionConfig implements ConnectionConfig
 {
 
-    public MockConnectionConfig(UUID _id, ConnectionConfigType _configType,
+    public MockConnectionConfig(UUID _qmfId, ConnectionConfigType _configType,
                     ConfiguredObject<ConnectionConfigType, ConnectionConfig> _parent, boolean _durable,
                     long _createTime, VirtualHostConfig _virtualHost, String _address, Boolean _incoming,
                     Boolean _systemConnection, Boolean _federationLink, String _authId, String _remoteProcessName,
                     Integer _remotePID, Integer _remoteParentPID, ConfigStore _configStore, Boolean _shadow)
     {
         super();
-        this._id = _id;
+        this._qmfId = _qmfId;
         this._configType = _configType;
         this._parent = _parent;
         this._durable = _durable;
@@ -50,7 +50,7 @@ public class MockConnectionConfig implements ConnectionConfig
         this._shadow = _shadow;
     }
 
-    private UUID _id;
+    private UUID _qmfId;
     private ConnectionConfigType _configType;
     private ConfiguredObject<ConnectionConfigType, ConnectionConfig> _parent;
     private boolean _durable;
@@ -68,9 +68,9 @@ public class MockConnectionConfig implements ConnectionConfig
     private Boolean _shadow;
 
     @Override
-    public UUID getId()
+    public UUID getQMFId()
     {
-        return _id;
+        return _qmfId;
     }
 
     @Override
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 73046b0345..4befd26ece 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -83,7 +83,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
     protected void unbind(TestQueue queue, String... bindings) throws AMQException
     {
         String queueName = queue.getName();
-        exchange.onUnbind(new Binding(null,queueName, queue, exchange, getHeadersMap(bindings)));
+        exchange.onUnbind(new Binding(null, null, queueName, queue, exchange, getHeadersMap(bindings)));
     }
     
     protected int getCount()
@@ -95,7 +95,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
     {
         TestQueue queue = new TestQueue(new AMQShortString(queueName));
         queues.add(queue);
-        exchange.onBind(new Binding(null,key, queue, exchange, args));
+        exchange.onBind(new Binding(null, null, key, queue, exchange, args));
         return queue;
     }
     
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
index 833df34fd8..3988edcb3c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
@@ -160,7 +160,7 @@ public class HeadersBindingTest extends TestCase
 
         matchHeaders.setString("A", "Value of A");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -171,7 +171,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("A", "Value of A");
         matchHeaders.setString("B", "Value of B");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -181,7 +181,7 @@ public class HeadersBindingTest extends TestCase
 
         matchHeaders.setString("A", "Altered value of A");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertFalse(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -192,7 +192,7 @@ public class HeadersBindingTest extends TestCase
 
         matchHeaders.setString("A", "Value of A");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -204,7 +204,7 @@ public class HeadersBindingTest extends TestCase
 
         matchHeaders.setString("A", "Value of A");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertFalse(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -217,7 +217,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("A", "Value of A");
         matchHeaders.setString("B", "Value of B");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -231,7 +231,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("B", "Value of B");
         matchHeaders.setString("C", "Value of C");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -245,7 +245,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("B", "Altered value of B");
         matchHeaders.setString("C", "Value of C");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertFalse(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -256,7 +256,7 @@ public class HeadersBindingTest extends TestCase
 
         matchHeaders.setString("A", "Value of A");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -268,7 +268,7 @@ public class HeadersBindingTest extends TestCase
 
         matchHeaders.setString("A", "Value of A");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -281,7 +281,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("A", "Value of A");
         matchHeaders.setString("B", "Value of B");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -295,7 +295,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("B", "Value of B");
         matchHeaders.setString("C", "Value of C");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -309,7 +309,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("B", "Altered value of B");
         matchHeaders.setString("C", "Value of C");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertTrue(new HeadersBinding(b).matches(matchHeaders));
     }
 
@@ -323,7 +323,7 @@ public class HeadersBindingTest extends TestCase
         matchHeaders.setString("B", "Altered value of B");
         matchHeaders.setString("C", "Value of C");
 
-        Binding b = new Binding(null, getQueueName(), _queue, null, bindHeaders);
+        Binding b = new Binding(null, null, getQueueName(), _queue, null, bindHeaders);
         assertFalse(new HeadersBinding(b).matches(matchHeaders));
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index 6e29a7ba31..92274afece 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -66,7 +66,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testNoRoute() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a*#b", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.*.#.b", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.*.#.b",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.b");
@@ -78,7 +78,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testDirectMatch() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "ab", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.b", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.b",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.b");
@@ -105,7 +105,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testStarMatch() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a*", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.*", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.*",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.b");
@@ -144,7 +144,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testHashMatch() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.#", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.#",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.b.c");
@@ -207,7 +207,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testMidHash() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.*.#.b", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.*.#.b",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.c.d.b");
@@ -237,7 +237,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testMatchafterHash() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.*.#.b.c", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.*.#.b.c",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.c.b.b");
@@ -283,7 +283,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testHashAfterHash() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.*.#.b.c.#.d", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.*.#.b.c.#.d",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.c.b.b.c");
@@ -310,7 +310,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testHashHash() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.#.*.#.d", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.#.*.#.d",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.c.b.b.c");
@@ -336,7 +336,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testSubMatchFails() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.b.c.d", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.b.c.d",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.b.c");
@@ -366,7 +366,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testMoreRouting() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.b", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.b",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a.b.c");
@@ -381,7 +381,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
     public void testMoreQueue() throws AMQException
     {
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), "a", false, null, false, false, _vhost, null);
-        _exchange.registerQueue(new Binding(null,"a.b", queue,_exchange, null));
+        _exchange.registerQueue(new Binding(null, null, "a.b",queue, _exchange, null));
 
 
         IncomingMessage message = createMessage("a");
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index d3eb61a544..bcb8d54636 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -186,6 +186,12 @@ public class MockAMQQueue implements AMQQueue
         return null;
     }
 
+    @Override
+    public UUID getQMFId()
+    {
+        return null;
+    }
+
     public QueueConfigType getConfigType()
     {
         return null;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
index 9c8f525120..cd8d91d835 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
@@ -161,8 +161,8 @@ public class DurableConfigurationStoreTest extends QpidTestCase
     public void testBindQueue() throws Exception
     {
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
-        Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue, _exchange,
-                FieldTable.convertToMap(_bindingArgs));
+        Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), null, ROUTING_KEY, queue,
+                _exchange, FieldTable.convertToMap(_bindingArgs));
         _store.bindQueue(binding);
 
         reopenStore();
@@ -175,8 +175,8 @@ public class DurableConfigurationStoreTest extends QpidTestCase
     public void testUnbindQueue() throws Exception
     {
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
-        Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue, _exchange,
-                FieldTable.convertToMap(_bindingArgs));
+        Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), null, ROUTING_KEY, queue,
+                _exchange, FieldTable.convertToMap(_bindingArgs));
         _store.bindQueue(binding);
 
         _store.unbindQueue(binding);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
index 363eb5ecab..51d20b6d5f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
@@ -302,7 +302,7 @@ public class MockSubscription implements Subscription
         }
 
         @Override
-        public UUID getId()
+        public UUID getQMFId()
         {
             return null;
         }
@@ -453,12 +453,6 @@ public class MockSubscription implements Subscription
         }
 
         @Override
-        public UUID getId()
-        {
-            return null;
-        }
-
-        @Override
         public void close(AMQConstant cause, String message)
                 throws AMQException
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index df31845798..290c465785 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
@@ -216,6 +216,12 @@ public class MockVirtualHost implements VirtualHost
         return null;
     }
 
+    @Override
+    public UUID getQMFId()
+    {
+        return null;
+    }
+
     public ConfiguredObject<VirtualHostConfigType, VirtualHostConfig> getParent()
     {
         return null;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
index fdd163b323..aa8448b99d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
@@ -146,7 +146,7 @@ public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 
         MockAMQQueue queue = createOwnedQueue();
 
-        queue.addBinding(new Binding(null, "bindingKey", queue, new DirectExchange(), null));
+        queue.addBinding(new Binding(null, null, "bindingKey", queue, new DirectExchange(), null));
 
         policy.performPolicy(queue);
 
@@ -165,7 +165,7 @@ public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 
         MockAMQQueue queue = createOwnedQueue();
 
-        queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null));
+        queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null));
 
         queue.setAutoDelete(false);
 
@@ -186,7 +186,7 @@ public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 
         final MockAMQQueue queue = createOwnedQueue();
 
-        queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null));
+        queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null));
 
         setQueueToAutoDelete(queue);
 
@@ -207,7 +207,7 @@ public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 
         MockAMQQueue queue = createOwnedQueue();
 
-        queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null));
+        queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null));
 
         policy.performPolicy(queue);
 
@@ -233,7 +233,7 @@ public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 
         MockAMQQueue queue = createOwnedQueue();
 
-        queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null));
+        queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null));
 
         policy.performPolicy(queue);
 
@@ -253,7 +253,7 @@ public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 
         MockAMQQueue queue = createOwnedQueue();
 
-        queue.addBinding(new Binding(null, "bindingKey", queue, new TopicExchange(), null));
+        queue.addBinding(new Binding(null, null, "bindingKey", queue, new TopicExchange(), null));
 
         policy.performPolicy(queue);