QPID-5615 : Address review comments from Alex Rudyy

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

38 files changed, 128 insertions, 225 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
index 3bf90248b9..8b6cb1c387 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
@@ -63,7 +63,7 @@ public class BindingImpl
 
     public BindingImpl(Map<String, Object> attributes, AMQQueue queue, ExchangeImpl exchange)
     {
-        super(parentsMap(queue,exchange),enhanceWithDurable(attributes,queue,exchange),queue.getVirtualHost().getTaskExecutor());
+        super(parentsMap(queue,exchange),enhanceWithDurable(attributes,queue,exchange));
         _bindingKey = getName();
         _queue = queue;
         _exchange = exchange;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 5bf1c112cb..1f0f20ef1b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -108,7 +108,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
     public AbstractExchange(Map<String, Object> attributes, VirtualHostImpl vhost)
     {
-        super(parentsMap(vhost), attributes, vhost.getTaskExecutor());
+        super(parentsMap(vhost), attributes);
         _virtualHost = vhost;
         // check ACL
         try
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index c48f505259..c5127bae16 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -714,12 +714,6 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
     }
 
     @Override
-    public <T> T getAttribute(final ConfiguredObjectAttribute<? super X, T> attr)
-    {
-        return (T) getAttribute(attr.getName());
-    }
-
-    @Override
     public final Map<String, Object> getActualAttributes()
     {
         synchronized (_attributes)
@@ -1070,52 +1064,6 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         // allowed by default
     }
 
-    /**
-     * Returns a map of effective attribute values that would result
-     * if applying the supplied changes. Does not apply the changes.
-     */
-    protected Map<String, Object> generateEffectiveAttributes(Map<String,Object> changedValues)
-    {
-        //Build a new set of effective attributes that would be
-        //the result of applying the attribute changes, so we
-        //can validate the configuration that would result
-
-        Map<String, Object> existingActualValues = getActualAttributes();
-
-        //create a new merged map, starting with the defaults
-        Map<String, Object> merged =  new HashMap<String, Object>();
-
-        for(String name : getAttributeNames())
-        {
-            if(changedValues.containsKey(name))
-            {
-                Object changedValue = changedValues.get(name);
-                if(changedValue != null)
-                {
-                    //use the new non-null value for the merged values
-                    merged.put(name, changedValue);
-                }
-                else
-                {
-                    //we just use the default (if there was one) since the changed
-                    //value is null and effectively clears any existing actual value
-                }
-            }
-            else if(existingActualValues.get(name) != null)
-            {
-                //Use existing non-null actual value for the merge
-                merged.put(name, existingActualValues.get(name));
-            }
-            else
-            {
-                //There was neither a change or an existing non-null actual
-                //value, so just use the default value (if there was one).
-            }
-        }
-
-        return merged;
-    }
-
     @Override
     public final String getLastUpdatedBy()
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
index d1d5f91b06..f960dfa6f9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
@@ -191,8 +191,6 @@ public interface ConfiguredObject<X extends ConfiguredObject<X>>
      */
     Object getAttribute(String name);
 
-    <T> T getAttribute(ConfiguredObjectAttribute<? super X, T> attr);
-
     /**
      * Return the map containing only explicitly set attributes
      *
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java
index 2e1350981c..0c8866fff1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java
@@ -23,6 +23,8 @@ package org.apache.qpid.server.model;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
+
 abstract class ConfiguredObjectAttributeOrStatistic<C extends ConfiguredObject, T>
 {
 
@@ -137,13 +139,29 @@ abstract class ConfiguredObjectAttributeOrStatistic<C extends ConfiguredObject,
         }
         catch (IllegalAccessException e)
         {
-            Object o = configuredObject.getAttribute(getName());
-            return getConverter().convert(o, configuredObject);
+            // This should never happen as it would imply a getter which is not public
+            throw new ServerScopedRuntimeException("Unable to get value for '"+getName()
+                                                   +"' from configured object of category "
+                                                   + configuredObject.getCategoryClass().getSimpleName(), e);
         }
         catch (InvocationTargetException e)
         {
-            Object o = configuredObject.getAttribute(getName());
-            return getConverter().convert(o, configuredObject);
+            Throwable targetException = e.getTargetException();
+            if(targetException instanceof RuntimeException)
+            {
+                throw (RuntimeException)targetException;
+            }
+            else if(targetException instanceof Error)
+            {
+                throw (Error)targetException;
+            }
+            else
+            {
+                // This should never happen as it would imply a getter which is declaring a checked exception
+                throw new ServerScopedRuntimeException("Unable to get value for '"+getName()
+                                                       +"' from configured object of category "
+                                                       + configuredObject.getCategoryClass().getSimpleName(), e);
+            }
         }
 
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
index 20020ea2a5..03e564a28d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
@@ -39,8 +39,7 @@ public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends Abstrac
 
     protected AbstractPluginAdapter(Map<String, Object> attributes, Broker broker)
     {
-        super(parentsMap(broker),
-              attributes, broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
         _broker = broker;
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
index 2927bb1491..6b77833bc9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
@@ -58,7 +58,7 @@ import org.apache.qpid.server.stats.StatisticsGatherer;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.util.SystemUtils;
 
-public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> implements Broker<BrokerAdapter>, ConfigurationChangeListener, StatisticsGatherer, StatisticsGatherer.Source
+public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> implements Broker<BrokerAdapter>, ConfigurationChangeListener, StatisticsGatherer
 {
     private static final Logger LOGGER = Logger.getLogger(BrokerAdapter.class);
 
@@ -104,9 +104,7 @@ public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> imple
     public BrokerAdapter(Map<String, Object> attributes,
                          SystemContext parent)
     {
-        super(parentsMap(parent),
-              attributes,
-              parent.getTaskExecutor());
+        super(parentsMap(parent), attributes);
 
         _logRecorder = parent.getLogRecorder();
         _eventLogger = parent.getEventLogger();
@@ -995,12 +993,6 @@ public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> imple
         _eventLogger = eventLogger;
     }
 
-    @Override
-    public StatisticsGatherer getStatisticsGatherer()
-    {
-        return this;
-    }
-
     public void registerMessageDelivered(long messageSize)
     {
         _messagesDelivered.registerEvent(1L);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index d20cc68184..7a4523035d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
@@ -22,11 +22,21 @@ package org.apache.qpid.server.model.adapter;
 
 import java.security.AccessControlException;
 import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.model.*;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Connection;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Session;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.SessionModelListener;
@@ -39,9 +49,9 @@ public final class ConnectionAdapter extends AbstractConfiguredObject<Connection
     private final Map<AMQSessionModel, SessionAdapter> _sessionAdapters =
             new HashMap<AMQSessionModel, SessionAdapter>();
 
-    public ConnectionAdapter(final AMQConnectionModel conn, TaskExecutor taskExecutor)
+    public ConnectionAdapter(final AMQConnectionModel conn)
     {
-        super(parentsMap(conn.getVirtualHost()),createAttributes(conn), taskExecutor);
+        super(parentsMap(conn.getVirtualHost()),createAttributes(conn));
         _connection = conn;
         open();
         conn.addSessionListener(this);
@@ -246,7 +256,7 @@ public final class ConnectionAdapter extends AbstractConfiguredObject<Connection
         {
             if(!_sessionAdapters.containsKey(session))
             {
-                SessionAdapter adapter = new SessionAdapter(this, session, getTaskExecutor());
+                SessionAdapter adapter = new SessionAdapter(this, session);
                 _sessionAdapters.put(session, adapter);
                 childAdded(adapter);
             }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index db60a5b0fe..4a88d13070 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -36,7 +36,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -71,8 +70,7 @@ public class FileBasedGroupProviderImpl
     public FileBasedGroupProviderImpl(Map<String, Object> attributes,
                                       Broker broker)
     {
-        super(parentsMap(broker),
-              attributes, broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
 
 
         _broker = broker;
@@ -140,7 +138,7 @@ public class FileBasedGroupProviderImpl
             UUID id = UUID.randomUUID();
             attrMap.put(Group.ID, id);
             attrMap.put(Group.NAME, group.getName());
-            GroupAdapter groupAdapter = new GroupAdapter(attrMap, getTaskExecutor());
+            GroupAdapter groupAdapter = new GroupAdapter(attrMap);
             principals.add(groupAdapter);
         }
 
@@ -229,7 +227,7 @@ public class FileBasedGroupProviderImpl
             UUID id = UUID.randomUUID();
             attrMap.put(Group.ID, id);
             attrMap.put(Group.NAME, groupName);
-            GroupAdapter groupAdapter = new GroupAdapter(attrMap, getTaskExecutor());
+            GroupAdapter groupAdapter = new GroupAdapter(attrMap);
             groupAdapter.create();
             return (C) groupAdapter;
 
@@ -409,9 +407,9 @@ public class FileBasedGroupProviderImpl
     private class GroupAdapter extends AbstractConfiguredObject<GroupAdapter> implements Group<GroupAdapter>
     {
 
-        public GroupAdapter(Map<String,Object> attributes, TaskExecutor taskExecutor)
+        public GroupAdapter(Map<String, Object> attributes)
         {
-            super(parentsMap(FileBasedGroupProviderImpl.this), attributes, taskExecutor);
+            super(parentsMap(FileBasedGroupProviderImpl.this), attributes);
         }
 
 
@@ -444,7 +442,7 @@ public class FileBasedGroupProviderImpl
                 Map<String,Object> attrMap = new HashMap<String, Object>();
                 attrMap.put(GroupMember.ID,id);
                 attrMap.put(GroupMember.NAME, principal.getName());
-                GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap, getTaskExecutor());
+                GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap);
                 groupMemberAdapter.open();
                 members.add(groupMemberAdapter);
             }
@@ -495,7 +493,7 @@ public class FileBasedGroupProviderImpl
                 Map<String,Object> attrMap = new HashMap<String, Object>();
                 attrMap.put(GroupMember.ID,id);
                 attrMap.put(GroupMember.NAME, memberName);
-                GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap, getTaskExecutor());
+                GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap);
                 groupMemberAdapter.create();
                 return (C) groupMemberAdapter;
 
@@ -539,10 +537,10 @@ public class FileBasedGroupProviderImpl
                 GroupMember<GroupMemberAdapter>
         {
 
-            public GroupMemberAdapter(Map<String,Object> attrMap, TaskExecutor taskExecutor)
+            public GroupMemberAdapter(Map<String, Object> attrMap)
             {
                 // TODO - need to relate to the User object
-                super(parentsMap(GroupAdapter.this),attrMap, taskExecutor);
+                super(parentsMap(GroupAdapter.this),attrMap);
             }
 
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
index 14f017ac7a..9434adf97a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
@@ -21,9 +21,7 @@
 
 package org.apache.qpid.server.model.adapter;
 
-import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
 import org.apache.qpid.server.model.AuthenticationProvider;
@@ -41,9 +39,6 @@ public class FileSystemPreferencesProviderFactory extends AbstractConfiguredObje
     public FileSystemPreferencesProviderImpl createInstance(final Map<String, Object> attributes,
                                                         final ConfiguredObject<?>... parents)
     {
-        Map<String,Object> attributesWithoutId = new HashMap<String, Object>(attributes);
-        Object idObj = attributesWithoutId.remove(ConfiguredObject.ID);
-        UUID id = idObj == null ? UUID.randomUUID() : idObj instanceof UUID ? (UUID) idObj : UUID.fromString(idObj.toString());
         return new FileSystemPreferencesProviderImpl(attributes, getParent(AuthenticationProvider.class,parents));
     }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
index c955d8d370..765fc149a0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
@@ -75,9 +75,7 @@ public class FileSystemPreferencesProviderImpl
     public FileSystemPreferencesProviderImpl(Map<String, Object> attributes,
                                              AuthenticationProvider<? extends AuthenticationProvider> authenticationProvider)
     {
-        super(parentsMap(authenticationProvider),
-              attributes,
-              authenticationProvider.getParent(Broker.class).getTaskExecutor());
+        super(parentsMap(authenticationProvider), attributes);
         State state = MapValueConverter.getEnumAttribute(State.class, STATE, attributes, State.INITIALISING);
         _state = new AtomicReference<State>(state);
         _authenticationProvider = authenticationProvider;
@@ -261,6 +259,7 @@ public class FileSystemPreferencesProviderImpl
         _state.compareAndSet(State.ERRORED, State.ACTIVE);
     }
 
+    /* Note this method is used: it is referenced by the annotation on _path to be called after _path is set */
     private void openNewStore()
     {
         if(_open)
@@ -326,7 +325,7 @@ public class FileSystemPreferencesProviderImpl
 
     }
 
-    public void createStoreIfNotExist()
+    private void createStoreIfNotExist()
     {
         _store.createIfNotExist();
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
index 3b55fcb1bd..c32bfac88c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Consumer;
@@ -47,10 +46,9 @@ final class SessionAdapter extends AbstractConfiguredObject<SessionAdapter> impl
 
 
     public SessionAdapter(final ConnectionAdapter connectionAdapter,
-                          final AMQSessionModel session,
-                          TaskExecutor taskExecutor)
+                          final AMQSessionModel session)
     {
-        super(parentsMap(connectionAdapter), createAttributes(session), taskExecutor);
+        super(parentsMap(connectionAdapter), createAttributes(session));
         _session = session;
         _session.addConsumerListener(new ConsumerListener()
         {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
index 0b1409c5b9..c16e17acf3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
@@ -42,9 +42,7 @@ public class VirtualHostAliasAdapter extends AbstractConfiguredObject<VirtualHos
 
     public VirtualHostAliasAdapter(VirtualHost virtualHost, Port port)
     {
-        super(parentsMap(virtualHost,port),
-              createAttributes(virtualHost, port),
-              virtualHost.getTaskExecutor());
+        super(parentsMap(virtualHost,port), createAttributes(virtualHost, port));
         _vhost = virtualHost;
         _port = port;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index 0363fb6cdd..13c35f97cc 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -76,9 +76,7 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
     public AbstractPort(Map<String, Object> attributes,
                         Broker<?> broker)
     {
-        super(parentsMap(broker),
-              attributes,
-              broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
 
         _broker = broker;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index e96850ca85..9e1a350d73 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -225,8 +225,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
 
     protected AbstractQueue(Map<String, Object> attributes, VirtualHostImpl virtualHost)
     {
-        super(parentsMap(virtualHost),
-              attributes, virtualHost.getTaskExecutor());
+        super(parentsMap(virtualHost), attributes);
 
         _virtualHost = virtualHost;
         _asyncDelivery = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
index b3d4e4368f..1d7bf7f2a9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
@@ -116,8 +116,7 @@ class QueueConsumerImpl
                       EnumSet<Option> optionSet)
     {
         super(parentsMap(queue, target.getSessionModel().getModelObject()),
-              createAttributeMap(consumerName, filters, optionSet),
-              queue.getVirtualHost().getTaskExecutor());
+              createAttributeMap(consumerName, filters, optionSet));
         _messageClass = messageClass;
         _sessionReference = target.getSessionModel().getConnectionReference();
         _consumerNumber = CONSUMER_NUMBER_GENERATOR.getAndIncrement();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
index 28adef11b9..ac5e334402 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
@@ -84,9 +84,7 @@ public class FileKeyStoreImpl extends AbstractConfiguredObject<FileKeyStoreImpl>
 
     public FileKeyStoreImpl(Map<String, Object> attributes, Broker<?> broker)
     {
-        super(parentsMap(broker),
-              attributes,
-              broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
 
         _broker = broker;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
index 954d9847d1..aad09ca21e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
@@ -68,9 +68,7 @@ public class FileTrustStoreImpl extends AbstractConfiguredObject<FileTrustStoreI
 
     public FileTrustStoreImpl(Map<String, Object> attributes, Broker<?> broker)
     {
-        super(parentsMap(broker),
-              attributes,
-              broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
         _broker = broker;
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
index 6312415c77..7424d32b54 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
@@ -59,8 +59,7 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
 
     protected AbstractAuthenticationManager(final Map<String, Object> attributes, final Broker broker)
     {
-        super(parentsMap(broker),
-              attributes, broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
         _broker = broker;
     }
 
@@ -136,11 +135,6 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
         throw new IllegalConfigurationException("Cannot associate  " + user + " with authentication provider " + this);
     }
 
-    public void instantiatePreferencesProvider(final PreferencesProvider preferencesProvider)
-    {
-        _preferencesProvider = preferencesProvider;
-    }
-
     @Override
     public State getState()
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManagerFactory.java
deleted file mode 100644
index de0d119a60..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManagerFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.security.auth.manager;
-
-import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
-import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
-
-public abstract class AbstractAuthenticationManagerFactory<X extends AbstractAuthenticationManager<X>>
-        extends AbstractConfiguredObjectTypeFactory<X> implements AuthenticationManagerFactory<X>
-{
-    protected AbstractAuthenticationManagerFactory(final Class<X> clazz)
-    {
-        super(clazz);
-    }
-
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
index a8063a5bed..18b2b00a6d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
@@ -20,22 +20,26 @@
  */
 package org.apache.qpid.server.security.auth.manager;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 import org.apache.qpid.server.store.ConfiguredObjectRecord;
 import org.apache.qpid.server.store.ResolvedObject;
 import org.apache.qpid.server.store.UnresolvedConfiguredObject;
 import org.apache.qpid.server.util.ResourceBundleLoader;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Base64MD5PasswordFileAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<Base64MD5PasswordDatabaseAuthenticationManager>
+public class Base64MD5PasswordFileAuthenticationManagerFactory
+        extends AbstractConfiguredObjectTypeFactory<Base64MD5PasswordDatabaseAuthenticationManager>
+        implements AuthenticationManagerFactory<Base64MD5PasswordDatabaseAuthenticationManager>
 {
     public static final String PROVIDER_TYPE = "Base64MD5PasswordFile";
     public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.PasswordFileAuthenticationProviderAttributeDescriptions";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
index 1f933be81d..327243fc71 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
@@ -24,12 +24,15 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 import org.apache.qpid.server.util.ResourceBundleLoader;
 
-public class ExternalAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<ExternalAuthenticationManagerImpl>
+public class ExternalAuthenticationManagerFactory extends AbstractConfiguredObjectTypeFactory<ExternalAuthenticationManagerImpl>
+        implements AuthenticationManagerFactory<ExternalAuthenticationManagerImpl>
 {
     public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.ExternalAuthenticationProviderAttributeDescriptions";
     public static final String PROVIDER_TYPE = "External";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
index 84d5343699..f8c2ac043e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
@@ -19,15 +19,19 @@
  */
 package org.apache.qpid.server.security.auth.manager;
 
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
-public class KerberosAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<KerberosAuthenticationManager>
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
+
+public class KerberosAuthenticationManagerFactory
+        extends AbstractConfiguredObjectTypeFactory<KerberosAuthenticationManager>
+        implements AuthenticationManagerFactory<KerberosAuthenticationManager>
 {
     public static final String PROVIDER_TYPE = "Kerberos";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
index 81dde6db81..13755e52fc 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
@@ -20,22 +20,26 @@
  */
 package org.apache.qpid.server.security.auth.manager;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 import org.apache.qpid.server.store.ConfiguredObjectRecord;
 import org.apache.qpid.server.store.ResolvedObject;
 import org.apache.qpid.server.store.UnresolvedConfiguredObject;
 import org.apache.qpid.server.util.ResourceBundleLoader;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PlainPasswordFileAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<PlainPasswordDatabaseAuthenticationManager>
+public class PlainPasswordFileAuthenticationManagerFactory
+        extends AbstractConfiguredObjectTypeFactory<PlainPasswordDatabaseAuthenticationManager>
+        implements AuthenticationManagerFactory<PlainPasswordDatabaseAuthenticationManager>
 {
     public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.PasswordFileAuthenticationProviderAttributeDescriptions";
     public static final String ATTRIBUTE_PATH = "path";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index 67785996d9..be49623249 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -385,8 +385,7 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
 
         public PrincipalAdapter(Principal user)
         {
-            super(parentsMap(PrincipalDatabaseAuthenticationManager.this),createPrincipalAttributes(PrincipalDatabaseAuthenticationManager.this, user),
-                  PrincipalDatabaseAuthenticationManager.this.getTaskExecutor());
+            super(parentsMap(PrincipalDatabaseAuthenticationManager.this),createPrincipalAttributes(PrincipalDatabaseAuthenticationManager.this, user));
             _user = user;
 
         }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
index 5ff7f015b4..00091490c5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
@@ -367,8 +367,7 @@ public class ScramSHA1AuthenticationManager
 
         protected ScramAuthUser(final Map<String, Object> attributes, ScramSHA1AuthenticationManager parent)
         {
-            super(parentsMap(parent),
-                  attributes, parent.getTaskExecutor());
+            super(parentsMap(parent), attributes);
             _authenticationManager = parent;
             if(!ASCII.newEncoder().canEncode(getName()))
             {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java
index 2fff86e8bc..e4096f6055 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java
@@ -24,11 +24,15 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 
-public class ScramSHA1AuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<ScramSHA1AuthenticationManager>
+public class ScramSHA1AuthenticationManagerFactory
+        extends AbstractConfiguredObjectTypeFactory<ScramSHA1AuthenticationManager>
+        implements AuthenticationManagerFactory<ScramSHA1AuthenticationManager>
 {
 
     public static final String PROVIDER_TYPE = "SCRAM-SHA-1";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
index e8fcd0d1a1..7dfa128a37 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
@@ -24,12 +24,16 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
 import org.apache.qpid.server.util.ResourceBundleLoader;
 
-public class SimpleLDAPAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<SimpleLDAPAuthenticationManagerImpl>
+public class SimpleLDAPAuthenticationManagerFactory
+        extends AbstractConfiguredObjectTypeFactory<SimpleLDAPAuthenticationManagerImpl>
+        implements AuthenticationManagerFactory<SimpleLDAPAuthenticationManagerImpl>
 {
     public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationProviderAttributeDescriptions";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
index 6956e8e56c..7fda6862ec 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
@@ -104,8 +104,4 @@ public interface StatisticsGatherer
      */
     void resetStatistics();
 
-    interface Source
-    {
-        StatisticsGatherer getStatisticsGatherer();
-    }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 01bcc01dd1..abe3e2ce45 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -159,8 +159,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
 
     public AbstractVirtualHost(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
     {
-        super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(VirtualHostNode.class, virtualHostNode),
-              enhanceWithId(attributes), ((Broker<?>)virtualHostNode.getParent(Broker.class)).getTaskExecutor());
+        super(parentsMap(virtualHostNode), attributes);
         _broker = virtualHostNode.getParent(Broker.class);
         _virtualHostNode = virtualHostNode;
 
@@ -177,16 +176,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
 
     }
 
-    private static Map<String, Object> enhanceWithId(Map<String, Object> attributes)
-    {
-        if(attributes.get(ID) == null)
-        {
-            attributes = new HashMap<String, Object>(attributes);
-            attributes.put(ID, UUID.randomUUID());
-        }
-        return attributes;
-    }
-
     public void validate()
     {
         super.validate();
@@ -978,7 +967,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
         {
             if(!_connectionAdapters.containsKey(connection))
             {
-                adapter = new ConnectionAdapter(connection, getTaskExecutor());
+                adapter = new ConnectionAdapter(connection);
                 _connectionAdapters.put(connection, adapter);
 
             }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
index 44139a71e0..168b03945a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.security.AccessControlException;
 import java.security.PrivilegedAction;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -33,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import javax.security.auth.Subject;
 
 import org.apache.log4j.Logger;
+
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
@@ -73,8 +73,7 @@ public abstract class AbstractStandardVirtualHostNode<X extends AbstractStandard
     @SuppressWarnings("rawtypes")
     public AbstractStandardVirtualHostNode(Broker<?> parent, Map<String, Object> attributes, TaskExecutor taskExecutor)
     {
-        super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, parent),
-              attributes, taskExecutor);
+        super(parentsMap(parent), attributes, taskExecutor);
         _broker = parent;
         SystemContext systemContext = _broker.getParent(SystemContext.class);
         _eventLogger = systemContext.getEventLogger();
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
index 78595afb36..2a7639e1bf 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
@@ -50,7 +50,7 @@ import org.apache.qpid.server.virtualhost.StandardVirtualHost;
 
 public class VirtualHostCreationTest extends TestCase
 {
-    private VirtualHostNode<?> _virtualHostNode;
+    private VirtualHostNode _virtualHostNode;
 
     @Override
     public void setUp() throws Exception
@@ -78,6 +78,7 @@ public class VirtualHostCreationTest extends TestCase
         when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
         when(_virtualHostNode.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
         when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
+        when(_virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class);
     }
 
     public void testCreateVirtualHostFromStoreConfigAttributes()
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
index 12cdb564ea..c6195d2efb 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
@@ -59,6 +59,9 @@ public class VirtualHostTest extends QpidTestCase
         ConfiguredObjectFactory objectFactory = _broker.getObjectFactory();
         when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
         when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
+        when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
+
+        when(((VirtualHostNode)_virtualHostNode).getCategoryClass()).thenReturn(VirtualHostNode.class);
     }
 
 
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
index 84c8498181..8c1766d188 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
@@ -65,7 +65,7 @@ public class FileSystemPreferencesProviderTest extends QpidTestCase
         _broker = BrokerTestHelper.createBrokerMock();
         _taskExecutor = new CurrentThreadTaskExecutor();
         _taskExecutor.start();
-        when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
+        when(_authenticationProvider.getTaskExecutor()).thenReturn(_taskExecutor);
 
         when(_authenticationProvider.getParent(Broker.class)).thenReturn(_broker);
         ConfiguredObjectFactory objectFactory = _broker.getObjectFactory();
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
index 1584f0fb79..a3855ab481 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
@@ -116,14 +116,16 @@ public class BrokerTestHelper
 
         Broker<?> broker = createBrokerMock();
         ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
-        when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
 
-        VirtualHostNode<?> virtualHostNode = mock(VirtualHostNode.class);
+        VirtualHostNode virtualHostNode = mock(VirtualHostNode.class);
+        when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
+
         DurableConfigurationStore dcs = mock(DurableConfigurationStore.class);
         when(virtualHostNode.getConfigurationStore()).thenReturn(dcs);
         when(virtualHostNode.getParent(Broker.class)).thenReturn(broker);
         when(virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
         when(virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
+        when(virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class);
         AbstractVirtualHost host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
         host.setDesiredState(host.getState(), State.ACTIVE);
 
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index ac38ae7af9..170b3535b9 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
@@ -35,7 +35,6 @@ import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.model.BrokerModel;
 import org.apache.qpid.server.model.ConfigurationChangeListener;
 import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObjectAttribute;
 import org.apache.qpid.server.model.ConfiguredObjectFactory;
 import org.apache.qpid.server.model.Connection;
 import org.apache.qpid.server.model.IllegalStateTransitionException;
@@ -448,12 +447,6 @@ public class MockVirtualHost implements VirtualHostImpl<MockVirtualHost, AMQQueu
 
     }
 
-
-    public long getCreateTime()
-    {
-        return 0;
-    }
-
     public UUID getId()
     {
         return null;
@@ -483,12 +476,6 @@ public class MockVirtualHost implements VirtualHostImpl<MockVirtualHost, AMQQueu
     }
 
     @Override
-    public <T> T getAttribute(final ConfiguredObjectAttribute<? super MockVirtualHost, T> attr)
-    {
-        return null;
-    }
-
-    @Override
     public Map<String, Object> getActualAttributes()
     {
         return null;
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
index 05ba456b89..2d0403370b 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
@@ -90,7 +90,8 @@ public class VirtualHostQueueCreationTest extends QpidTestCase
         when(_virtualHostNode.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
         when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
         when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
-
+        when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
+        when(((VirtualHostNode)_virtualHostNode).getCategoryClass()).thenReturn(VirtualHostNode.class);
         _virtualHost = createHost();
     }
 
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
index be9642795b..c3ce92f5b1 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
@@ -58,8 +58,7 @@ public class ACLFileAccessControlProviderImpl
 
     public ACLFileAccessControlProviderImpl(Map<String, Object> attributes, Broker broker)
     {
-        super(parentsMap(broker),
-              attributes, broker.getTaskExecutor());
+        super(parentsMap(broker), attributes);
 
 
         _broker = broker;