QPID-5698 : [Java Broker] make the lifetimePolicy attribute automated

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

42 files changed, 113 insertions, 443 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 4ba3c7ba68..2b94ab4cab 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
@@ -35,9 +35,7 @@ import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.BindingMessages;
 import org.apache.qpid.server.logging.subjects.BindingLogSubject;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
-import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -150,11 +148,6 @@ public class BindingImpl
         return _matches.get();
     }
 
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
     @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(final Class<C> clazz)
     {
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 74e772c4ba..d135d05e64 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
@@ -48,7 +48,9 @@ import org.apache.qpid.server.message.MessageReference;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.Publisher;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.State;
@@ -60,7 +62,6 @@ import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.store.StorableMessageMetaData;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
-import org.apache.qpid.server.util.MapValueConverter;
 import org.apache.qpid.server.util.StateChangeListener;
 import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException;
 import org.apache.qpid.server.virtualhost.RequiredExchangeException;
@@ -72,10 +73,10 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
         implements ExchangeImpl<T>
 {
     private static final Logger _logger = Logger.getLogger(AbstractExchange.class);
-    private final LifetimePolicy _lifetimePolicy;
     private final AtomicBoolean _closed = new AtomicBoolean();
 
-    private ExchangeImpl _alternateExchange;
+    @ManagedAttributeField(beforeSet = "preSetAlternateExchange", afterSet = "postSetAlternateExchange" )
+    private Exchange<?> _alternateExchange;
 
     private VirtualHostImpl _virtualHost;
 
@@ -109,51 +110,11 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
     {
         super(parentsMap(vhost), attributes, vhost.getTaskExecutor());
         _virtualHost = vhost;
-
-        _lifetimePolicy = MapValueConverter.getEnumAttribute(LifetimePolicy.class,
-                                                                                org.apache.qpid.server.model.Exchange.LIFETIME_POLICY,
-                                                                                attributes,
-                                                                                LifetimePolicy.PERMANENT);
-        _autoDelete = _lifetimePolicy != LifetimePolicy.PERMANENT;
-        _logSubject = new ExchangeLogSubject(this, this.getVirtualHost());
-
-
         // check ACL
         _virtualHost.getSecurityManager().authoriseCreateExchange(this);
 
-        Object alternateExchangeAttr = attributes.get(org.apache.qpid.server.model.Exchange.ALTERNATE_EXCHANGE);
-        if(alternateExchangeAttr != null)
-        {
-            if(alternateExchangeAttr instanceof ExchangeImpl)
-            {
-                setAlternateExchange((ExchangeImpl) alternateExchangeAttr);
-            }
-            else if(alternateExchangeAttr instanceof UUID)
-            {
-                setAlternateExchange(vhost.getExchange((UUID) alternateExchangeAttr));
-            }
-            else if(alternateExchangeAttr instanceof String)
-            {
-                setAlternateExchange(vhost.getExchange((String) alternateExchangeAttr));
-                if(_alternateExchange == null)
-                {
-                    try
-                    {
-                        UUID altExcAsUUID = UUID.fromString((String)alternateExchangeAttr);
-                        setAlternateExchange(vhost.getExchange(altExcAsUUID));
-                    }
-                    catch (IllegalArgumentException e)
-                    {
-                        // ignore - we'll throw an exception shortly because _alternateExchange will be null
-                    }
-                }
-            }
-            if(_alternateExchange == null)
-            {
-                throw new UnknownExchangeException(alternateExchangeAttr.toString());
-            }
+        _logSubject = new ExchangeLogSubject(this, this.getVirtualHost());
 
-        }
         _bindingListener = new StateChangeListener<BindingImpl, State>()
         {
             @Override
@@ -171,6 +132,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
     protected void onOpen()
     {
         super.onOpen();
+        postSetAlternateExchange();
         // Log Exchange creation
         getEventLogger().message(ExchangeMessages.CREATED(getExchangeType().getType(), getName(), isDurable()));
     }
@@ -191,7 +153,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
     public boolean isAutoDelete()
     {
-        return _autoDelete;
+        return getLifetimePolicy() != LifetimePolicy.PERMANENT;
     }
 
     public void close()
@@ -208,7 +170,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
             if(_alternateExchange != null)
             {
-                _alternateExchange.removeReference(this);
+                ((ExchangeImpl)_alternateExchange).removeReference(this);
             }
 
             getEventLogger().message(_logSubject, ExchangeMessages.DELETED());
@@ -334,23 +296,25 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
         return !_bindings.isEmpty();
     }
 
-    public ExchangeImpl getAlternateExchange()
+    public Exchange<?> getAlternateExchange()
     {
         return _alternateExchange;
     }
 
-    public void setAlternateExchange(ExchangeImpl exchange)
+    private void preSetAlternateExchange()
     {
-        if(_alternateExchange != null)
+        if (_alternateExchange != null)
         {
-            _alternateExchange.removeReference(this);
+            ((ExchangeImpl) _alternateExchange).removeReference(this);
         }
-        if(exchange != null)
+    }
+
+    private void postSetAlternateExchange()
+    {
+        if(_alternateExchange != null)
         {
-            exchange.addReference(this);
+            ((ExchangeImpl)_alternateExchange).addReference(this);
         }
-        _alternateExchange = exchange;
-
     }
 
     public void removeReference(ExchangeReferrer exchange)
@@ -481,10 +445,10 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
         if(queues == null || queues.isEmpty())
         {
-            ExchangeImpl altExchange = getAlternateExchange();
+            Exchange altExchange = getAlternateExchange();
             if(altExchange != null)
             {
-                return altExchange.send(message, routingAddress, instanceProperties, txn, postEnqueueAction);
+                return ((ExchangeImpl)altExchange).send(message, routingAddress, instanceProperties, txn, postEnqueueAction);
             }
             else
             {
@@ -678,6 +642,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
         if (existingMapping == null || force)
         {
             b.addStateChangeListener(_bindingListener);
+            b.open();
             if (existingMapping != null)
             {
                 existingMapping.delete();
@@ -730,12 +695,6 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return _lifetimePolicy;
-    }
-
-    @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(final Class<C> clazz)
     {
         if(org.apache.qpid.server.model.Binding.class.isAssignableFrom(clazz))
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java
index 799bb79595..ff63a83292 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.server.exchange;
 
+import java.util.Map;
+import java.util.UUID;
+
 import org.apache.qpid.server.binding.BindingImpl;
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.message.MessageDestination;
@@ -27,9 +30,6 @@ import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.queue.AMQQueue;
 
-import java.util.Map;
-import java.util.UUID;
-
 public interface ExchangeImpl<T extends ExchangeImpl<T>> extends Exchange<T>, ExchangeReferrer, MessageDestination
 {
 
@@ -48,9 +48,7 @@ public interface ExchangeImpl<T extends ExchangeImpl<T>> extends Exchange<T>, Ex
      */
     boolean isAutoDelete();
 
-    ExchangeImpl getAlternateExchange();
-
-    void setAlternateExchange(ExchangeImpl exchange);
+    Exchange<?> getAlternateExchange();
 
     boolean addBinding(String bindingKey, AMQQueue queue, Map<String, Object> arguments);
     boolean deleteBinding(String bindingKey, AMQQueue queue);
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 c9e50bc3ca..4d03d86ded 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
@@ -135,6 +135,9 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
     @ManagedAttributeField
     private boolean _durable;
 
+    @ManagedAttributeField
+    private LifetimePolicy _lifetimePolicy;
+
     private final Map<String, ConfiguredObjectAttribute<?,?>> _attributeTypes;
     private final Map<String, AutomatedField> _automatedFields;
 
@@ -654,6 +657,12 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
     }
 
     @Override
+    public LifetimePolicy getLifetimePolicy()
+    {
+        return _lifetimePolicy;
+    }
+
+    @Override
     public <T> T getAttribute(final ConfiguredObjectAttribute<? super X, T> attr)
     {
         return (T) getAttribute(attr.getName());
@@ -1563,7 +1572,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         int oldSize = 0;
         Model model = Model.getInstance();
 
-        Set<Class<? extends ConfiguredObject>> allDescendants = new HashSet<Class<? extends ConfiguredObject>>(Collections.singleton(candidate));
+        Set<Class<? extends ConfiguredObject>> allDescendants = new HashSet<Class<? extends ConfiguredObject>>(model.getChildTypes(candidate));
         while(allDescendants.size() > oldSize)
         {
             oldSize = allDescendants.size();
@@ -1572,6 +1581,10 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
             {
                 allDescendants.addAll(model.getChildTypes(clazz));
             }
+            if(allDescendants.contains(descendantClass))
+            {
+                break;
+            }
         }
         return allDescendants.contains(descendantClass);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
index d1819445a8..0ec51a99b4 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AccessControlProvider.java
@@ -19,17 +19,11 @@
  */
 package org.apache.qpid.server.model;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.UUID;
-
 import org.apache.qpid.server.security.AccessControl;
 
 @ManagedObject
 public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>
 {
-    public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TYPE = "type";
 
     //retrieve the underlying AccessControl object
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
index 0ec5927484..5873a09c9c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
@@ -34,7 +34,6 @@ public interface AuthenticationProvider<X extends AuthenticationProvider<X>> ext
 {
 
     public static final String DESCRIPTION = "description";
-    public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     //children
     Collection<VirtualHostAlias> getVirtualHostPortBindings();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
index c3a2febfd3..9c774f1684 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
@@ -27,9 +27,7 @@ public interface Binding<X extends Binding<X>> extends ConfiguredObject<X>
 {
 
     public String ARGUMENTS = "arguments";
-    public String LIFETIME_POLICY = "lifetimePolicy";
     public String STATE = "state";
-    public String TIME_TO_LIVE = "timeToLive";
     public String QUEUE = "queue";
     public String EXCHANGE = "exchange";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
index 08cf85e65b..4845bcdbc1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
@@ -45,7 +45,6 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>, EventL
     String SUPPORTED_VIRTUALHOST_STORE_TYPES = "supportedVirtualHostStoreTypes";
     String SUPPORTED_AUTHENTICATION_PROVIDERS = "supportedAuthenticationProviders";
     String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes";
-    String LIFETIME_POLICY = "lifetimePolicy";
     String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
     String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
     String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled";
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 6a7eabd5d6..1b62aa4ce7 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
@@ -33,17 +33,19 @@ import org.apache.qpid.server.store.ConfiguredObjectRecord;
  */
 public interface ConfiguredObject<X extends ConfiguredObject<X>>
 {
-    public static final String ID = "id";
-    public static final String NAME = "name";
-    public static final String TYPE = "type";
-    public static final String DESCRIPTION = "description";
-    public static final String DURABLE = "durable";
-    public static final String CONTEXT = "context";
-    public static final String LAST_UPDATED_BY = "lastUpdatedBy";
-    public static final String LAST_UPDATED_TIME = "lastUpdatedTime";
-    public static final String STATE = "state";
-    public static final String CREATED_BY = "createdBy";
-    public static final String CREATED_TIME = "createdTime";
+    String ID = "id";
+    String NAME = "name";
+    String TYPE = "type";
+    String DESCRIPTION = "description";
+    String DURABLE = "durable";
+    String CONTEXT = "context";
+    String LIFETIME_POLICY = "lifetimePolicy";
+
+    String LAST_UPDATED_BY = "lastUpdatedBy";
+    String LAST_UPDATED_TIME = "lastUpdatedTime";
+    String STATE = "state";
+    String CREATED_BY = "createdBy";
+    String CREATED_TIME = "createdTime";
 
 
     /**
@@ -162,7 +164,7 @@ public interface ConfiguredObject<X extends ConfiguredObject<X>>
      *
      * @return the lifetime policy
      */
-    @ManagedAttribute
+    @ManagedAttribute( automate = true, defaultValue = "PERMANENT" )
     LifetimePolicy getLifetimePolicy();
 
     /**
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index e2e4011abe..4e2d82e68e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
@@ -29,7 +29,6 @@ public interface Connection<X extends Connection<X>> extends ConfiguredObject<X>
     // Attributes
 
     public static final String STATE = "state";
-    public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     public static final String CLIENT_ID = "clientId";
     public static final String CLIENT_VERSION = "clientVersion";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
index 38c488c1f3..8e9a0f7d9a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
@@ -20,10 +20,6 @@
  */
 package org.apache.qpid.server.model;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
 @ManagedObject
 public interface Consumer<X extends Consumer<X>> extends ConfiguredObject<X>
 {
@@ -32,7 +28,6 @@ public interface Consumer<X extends Consumer<X>> extends ConfiguredObject<X>
     public String NO_LOCAL = "noLocal";
     public String SELECTOR = "selector";
     public String SETTLEMENT_MODE = "settlementMode";
-    public String LIFETIME_POLICY = "lifetimePolicy";
     public String STATE = "state";
 
     @ManagedAttribute( automate = true )
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
index 9f8c4321a1..e7b5dd971d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
@@ -26,19 +26,19 @@ import java.util.Map;
 @ManagedObject
 public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY                      = "lifetimePolicy";
     String STATE                                = "state";
     String ALTERNATE_EXCHANGE                   = "alternateExchange";
 
     // Attributes
 
-    @ManagedAttribute
+    @ManagedAttribute(automate = true)
     Exchange<?> getAlternateExchange();
 
     //children
     Collection<? extends Binding> getBindings();
     Collection<Publisher> getPublishers();
 
+    // Statistics
     @ManagedStatistic
     long getBindingCount();
 
@@ -62,7 +62,6 @@ public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>
                           Map<String, Object> attributes);
 
 
-    // Statistics
 
     void delete();
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
index bafd93268a..b5f8ee4888 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Group.java
@@ -22,6 +22,5 @@ package org.apache.qpid.server.model;
 @ManagedObject
 public interface Group<X extends Group<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
index ffd1eea942..7ce56f25d8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupMember.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.model;
 @ManagedObject
 public interface GroupMember<X extends GroupMember<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
 
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
index 8d498c0a5c..50f5f32b0c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/GroupProvider.java
@@ -20,16 +20,12 @@
 package org.apache.qpid.server.model;
 
 import java.security.Principal;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Set;
 
 @ManagedObject
 public interface GroupProvider<X extends GroupProvider<X>> extends ConfiguredObject<X>
 {
     public static final String DESCRIPTION = "description";
-    public static final String LIFETIME_POLICY = "lifetimePolicy";
 
     Set<Principal> getGroupPrincipalsForUser(String username);
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
index 61b0edd3c7..8ca23af072 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/KeyStore.java
@@ -26,7 +26,6 @@ import javax.net.ssl.KeyManager;
 @ManagedObject( defaultType = "FileKeyStore" )
 public interface KeyStore<X extends KeyStore<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY = "lifetimePolicy";
     String STATE = "state";
     String DESCRIPTION = "description";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
index 4671e2c55c..27b2333d55 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Plugin.java
@@ -23,7 +23,4 @@ package org.apache.qpid.server.model;
 @ManagedObject
 public interface Plugin<X extends Plugin<X>> extends ConfiguredObject<X>
 {
-    //Hack, using it for the class name only for consistency with the other things.
-    String LIFETIME_POLICY                      = "lifetimePolicy";
-
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index 93b7347159..766cde7ed8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
@@ -27,7 +27,6 @@ import java.util.Set;
 @ManagedObject
 public interface Port<X extends Port<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY                      = "lifetimePolicy";
     String BINDING_ADDRESS                      = "bindingAddress";
     String PORT                                 = "port";
     String PROTOCOLS                            = "protocols";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
index 2f8ffa1a1e..893bb423f8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
@@ -27,7 +27,6 @@ import java.util.Set;
 @ManagedObject
 public interface PreferencesProvider<X extends PreferencesProvider<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY = "lifetimePolicy";
 
     /**
      * Returns preferences {@link Map} for a given user ID
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index b8485ee26b..a2bac46aff 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -29,30 +29,28 @@ import org.apache.qpid.server.queue.QueueEntryVisitor;
 public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
 {
 
-    public static final String LIFETIME_POLICY = "lifetimePolicy";
-
-    public static final String ALERT_REPEAT_GAP = "alertRepeatGap";
-    public static final String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
-    public static final String ALERT_THRESHOLD_MESSAGE_SIZE = "alertThresholdMessageSize";
-    public static final String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "alertThresholdQueueDepthBytes";
-    public static final String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "alertThresholdQueueDepthMessages";
-    public static final String ALTERNATE_EXCHANGE = "alternateExchange";
-    public static final String EXCLUSIVE = "exclusive";
-    public static final String MESSAGE_GROUP_KEY = "messageGroupKey";
-    public static final String MESSAGE_GROUP_SHARED_GROUPS = "messageGroupSharedGroups";
-    public static final String MESSAGE_GROUP_DEFAULT_GROUP = "messageGroupDefaultGroup";
-    public static final String LVQ_KEY = "lvqKey";
-    public static final String MAXIMUM_DELIVERY_ATTEMPTS = "maximumDeliveryAttempts";
-    public static final String NO_LOCAL = "noLocal";
-    public static final String OWNER = "owner";
-    public static final String QUEUE_FLOW_CONTROL_SIZE_BYTES = "queueFlowControlSizeBytes";
-    public static final String QUEUE_FLOW_RESUME_SIZE_BYTES = "queueFlowResumeSizeBytes";
-    public static final String QUEUE_FLOW_STOPPED = "queueFlowStopped";
-    public static final String SORT_KEY = "sortKey";
-    public static final String QUEUE_TYPE = "queueType";
-    public static final String PRIORITIES = "priorities";
-
-    public static final String CREATE_DLQ_ON_CREATION = "x-qpid-dlq-enabled"; // TODO - this value should change
+    String ALERT_REPEAT_GAP = "alertRepeatGap";
+    String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
+    String ALERT_THRESHOLD_MESSAGE_SIZE = "alertThresholdMessageSize";
+    String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "alertThresholdQueueDepthBytes";
+    String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "alertThresholdQueueDepthMessages";
+    String ALTERNATE_EXCHANGE = "alternateExchange";
+    String EXCLUSIVE = "exclusive";
+    String MESSAGE_GROUP_KEY = "messageGroupKey";
+    String MESSAGE_GROUP_SHARED_GROUPS = "messageGroupSharedGroups";
+    String MESSAGE_GROUP_DEFAULT_GROUP = "messageGroupDefaultGroup";
+    String LVQ_KEY = "lvqKey";
+    String MAXIMUM_DELIVERY_ATTEMPTS = "maximumDeliveryAttempts";
+    String NO_LOCAL = "noLocal";
+    String OWNER = "owner";
+    String QUEUE_FLOW_CONTROL_SIZE_BYTES = "queueFlowControlSizeBytes";
+    String QUEUE_FLOW_RESUME_SIZE_BYTES = "queueFlowResumeSizeBytes";
+    String QUEUE_FLOW_STOPPED = "queueFlowStopped";
+    String SORT_KEY = "sortKey";
+    String QUEUE_TYPE = "queueType";
+    String PRIORITIES = "priorities";
+
+    String CREATE_DLQ_ON_CREATION = "x-qpid-dlq-enabled"; // TODO - this value should change
 
     @ManagedAttribute
     String getQueueType();
@@ -84,19 +82,19 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
     boolean isMessageGroupSharedGroups();
 
     @ManagedContextDefault( name = "queue.maximumDeliveryAttempts")
-    public static final int DEFAULT_MAXIMUM_DELIVERY_ATTEMPTS = 0;
+    int DEFAULT_MAXIMUM_DELIVERY_ATTEMPTS = 0;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.maximumDeliveryAttempts}")
     int getMaximumDeliveryAttempts();
 
     @ManagedContextDefault( name = "queue.queueFlowControlSizeBytes")
-    public static final long DEFAULT_FLOW_CONTROL_SIZE_BYTES = 0l;
+    long DEFAULT_FLOW_CONTROL_SIZE_BYTES = 0l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.queueFlowControlSizeBytes}")
     long getQueueFlowControlSizeBytes();
 
     @ManagedContextDefault( name = "queue.queueFlowResumeSizeBytes")
-    public static final long DEFAULT_FLOW_CONTROL_RESUME_SIZE_BYTES = 0l;
+    long DEFAULT_FLOW_CONTROL_RESUME_SIZE_BYTES = 0l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.queueFlowResumeSizeBytes}")
     long getQueueFlowResumeSizeBytes();
@@ -107,32 +105,32 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
     boolean isQueueFlowStopped();
 
     @ManagedContextDefault( name = "queue.alertThresholdMessageAge")
-    public static final long DEFAULT_ALERT_THRESHOLD_MESSAGE_AGE = 0l;
+    long DEFAULT_ALERT_THRESHOLD_MESSAGE_AGE = 0l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.alertThresholdMessageAge}")
     long getAlertThresholdMessageAge();
 
     @ManagedContextDefault( name = "queue.alertThresholdMessageSize")
-    public static final long DEFAULT_ALERT_THRESHOLD_MESSAGE_SIZE = 0l;
+    long DEFAULT_ALERT_THRESHOLD_MESSAGE_SIZE = 0l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.alertThresholdMessageSize}")
     long getAlertThresholdMessageSize();
 
     @ManagedContextDefault( name = "queue.alertThresholdQueueDepthBytes")
-    public static final long DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH = 0l;
+    long DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH = 0l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.alertThresholdQueueDepthBytes}")
     long getAlertThresholdQueueDepthBytes();
 
     @ManagedContextDefault( name = "queue.alertThresholdQueueDepthMessages")
-    public static final long DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT = 0l;
+    long DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT = 0l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.alertThresholdQueueDepthMessages}")
     long getAlertThresholdQueueDepthMessages();
 
 
     @ManagedContextDefault( name = "queue.alertRepeatGap")
-    public static final long DEFAULT_ALERT_REPEAT_GAP = 30000l;
+    long DEFAULT_ALERT_REPEAT_GAP = 30000l;
 
     @ManagedAttribute( automate = true, defaultValue = "${queue.alertRepeatGap}")
     long getAlertRepeatGap();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
index a2229cb513..f4db5e1018 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
@@ -20,20 +20,17 @@
  */
 package org.apache.qpid.server.model;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 @ManagedObject
 public interface Session<X extends Session<X>> extends ConfiguredObject<X>
 {
-    public static final String STATE = "state";
-    public static final String LIFETIME_POLICY = "lifetimePolicy";
+    String STATE = "state";
 
-    public static final String CHANNEL_ID = "channelId";
+    String CHANNEL_ID = "channelId";
     // PRODUCER_FLOW_BLOCKED is exposed as an interim step.  We will expose attribute(s) that exposing
     // available credit of both producer and consumer sides.
-    public static final String PRODUCER_FLOW_BLOCKED = "producerFlowBlocked";
+    String PRODUCER_FLOW_BLOCKED = "producerFlowBlocked";
 
     @ManagedAttribute( automate = true )
     int getChannelId();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java
index 589832e33b..6d04a9d2eb 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java
@@ -213,12 +213,6 @@ public class SystemContextImpl extends AbstractConfiguredObject<SystemContextImp
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-    @Override
     public ConfiguredObjectFactory getObjectFactory()
     {
         return _objectFactory;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
index 935424d2da..7ee42258e7 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/TrustStore.java
@@ -26,7 +26,6 @@ import javax.net.ssl.TrustManager;
 @ManagedObject( defaultType = "FileTrustStore" )
 public interface TrustStore<X extends TrustStore<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY = "lifetimePolicy";
     String DESCRIPTION = "description";
 
     @ManagedAttribute( secure = true, automate = true, mandatory = true)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
index 139de17f2d..d739de69ae 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java
@@ -26,13 +26,12 @@ import java.util.Map;
 @ManagedObject
 public interface User<X extends User<X>> extends ConfiguredObject<X>
 {
-    String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
     String PASSWORD        = "password";
 
     // Attributes
 
-    @ManagedAttribute( secure = true )
+    @ManagedAttribute( secure = true , automate = true )
     String getPassword();
 
     public void setPassword(String password);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index 88fe19e02f..ab29053c21 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
@@ -42,7 +42,6 @@ public interface VirtualHost<X extends VirtualHost<X, Q, E>, Q extends Queue<?>,
     String STORE_TRANSACTION_OPEN_TIMEOUT_WARN  = "storeTransactionOpenTimeoutWarn";
     String SUPPORTED_EXCHANGE_TYPES             = "supportedExchangeTypes";
     String SUPPORTED_QUEUE_TYPES                = "supportedQueueTypes";
-    String LIFETIME_POLICY                      = "lifetimePolicy";
     String SECURITY_ACL                         = "securityAcl";
     String HOUSE_KEEPING_THREAD_COUNT           = "houseKeepingThreadCount";
     String CONFIGURATION_STORE_SETTINGS         = "configurationStoreSettings";
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 8253af2614..dfb1514e9c 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
@@ -30,7 +30,6 @@ import java.util.UUID;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Plugin;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.security.access.Operation;
@@ -74,12 +73,6 @@ public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends Abstrac
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-    @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
     {
         return Collections.emptyList();
@@ -92,10 +85,6 @@ public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends Abstrac
         {
             return getState();
         }
-        else if (LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
         return super.getAttribute(name);
     }
 
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 834a655f11..81d2254a2c 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
@@ -456,11 +456,6 @@ public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> imple
         return null;  //TODO
     }
 
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
     public long getTimeToLive()
     {
         return 0;
@@ -802,22 +797,10 @@ public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> imple
     @Override
     public Object getAttribute(String name)
     {
-        if(ID.equals(name))
-        {
-            return getId();
-        }
-        else if(STATE.equals(name))
+        if(STATE.equals(name))
         {
             return State.ACTIVE;
         }
-        else if(DURABLE.equals(name))
-        {
-            return isDurable();
-        }
-        else if(LIFETIME_POLICY.equals(name))
-        {
-            return LifetimePolicy.PERMANENT;
-        }
         else if(BUILD_VERSION.equals(name))
         {
             return QpidProperties.getBuildVersion();
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 ec1aa21e81..28db268628 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
@@ -179,11 +179,6 @@ public final class ConnectionAdapter extends AbstractConfiguredObject<Connection
         return null;  //TODO
     }
 
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return null;  //TODO
-    }
-
     @Override
     public Object getAttribute(String name)
     {
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 a70f3ec0f6..afcfe93618 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
@@ -126,24 +126,11 @@ public class FileBasedGroupProviderImpl
         return _state.get();
     }
 
-    @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
 
     @Override
     public Object getAttribute(String name)
     {
-        if (DURABLE.equals(name))
-        {
-            return true;
-        }
-        else if (LIFETIME_POLICY.equals(name))
-        {
-            return LifetimePolicy.PERMANENT;
-        }
-        else if (STATE.equals(name))
+        if (STATE.equals(name))
         {
             return getState();
         }
@@ -360,12 +347,6 @@ public class FileBasedGroupProviderImpl
         }
 
         @Override
-        public LifetimePolicy getLifetimePolicy()
-        {
-            return LifetimePolicy.PERMANENT;
-        }
-
-        @Override
         public <C extends ConfiguredObject> Collection<C> getChildren(
                 Class<C> clazz)
         {
@@ -418,20 +399,6 @@ public class FileBasedGroupProviderImpl
         }
 
         @Override
-        public Object getAttribute(String name)
-        {
-            if (ID.equals(name))
-            {
-                return getId();
-            }
-            else if (NAME.equals(name))
-            {
-                return getName();
-            }
-            return super.getAttribute(name);
-        }
-
-        @Override
         protected boolean setState(State currentState, State desiredState)
                 throws IllegalStateTransitionException, AccessControlException
         {
@@ -497,12 +464,6 @@ public class FileBasedGroupProviderImpl
             }
 
             @Override
-            public LifetimePolicy getLifetimePolicy()
-            {
-                return null;
-            }
-
-            @Override
             public <C extends ConfiguredObject> Collection<C> getChildren(
                     Class<C> clazz)
             {
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 3be3a929bf..eee205a000 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
@@ -54,7 +54,6 @@ 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.IllegalStateTransitionException;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.util.MapValueConverter;
 
@@ -113,12 +112,6 @@ public class FileSystemPreferencesProviderImpl
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-    @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
     {
         return Collections.emptySet();
@@ -127,19 +120,7 @@ public class FileSystemPreferencesProviderImpl
     @Override
     public Object getAttribute(String name)
     {
-        if (DURABLE.equals(name))
-        {
-            return true;
-        }
-        else if (ID.equals(name))
-        {
-            return getId();
-        }
-        else if (LIFETIME_POLICY.equals(name))
-        {
-            return LifetimePolicy.PERMANENT;
-        }
-        else if (STATE.equals(name))
+        if (STATE.equals(name))
         {
             return getState();
         }
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 8b88d0dfc0..f9c4136dd8 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
@@ -73,6 +73,7 @@ final class SessionAdapter extends AbstractConfiguredObject<SessionAdapter> impl
         attributes.put(NAME, String.valueOf(session.getChannelId()));
         attributes.put(CHANNEL_ID, session.getChannelId());
         attributes.put(DURABLE, false);
+        attributes.put(LIFETIME_POLICY, LifetimePolicy.DELETE_ON_SESSION_END);
         return attributes;
     }
 
@@ -103,11 +104,6 @@ final class SessionAdapter extends AbstractConfiguredObject<SessionAdapter> impl
         return null;  //TODO
     }
 
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return null;  //TODO
-    }
-
     @Override
     public Object getAttribute(String name)
     {
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 43b6718a0d..9a01cd6aeb 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
@@ -29,7 +29,6 @@ import java.util.Map;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.AuthenticationMethod;
 import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.UUIDGenerator;
@@ -83,12 +82,6 @@ public class VirtualHostAliasAdapter extends AbstractConfiguredObject<VirtualHos
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;  // TODO - Implement
-    }
-
-    @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
     {
         return Collections.emptySet();
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 e8c445349c..94c6276c77 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
@@ -219,11 +219,6 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
         return _state.get();
     }
 
-    @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
 
     @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
@@ -245,10 +240,6 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
         {
             return getState();
         }
-        else if(LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
         return super.getAttribute(name);
     }
 
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 3f7f5f854a..3b1af69542 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
@@ -181,7 +181,6 @@ public abstract class AbstractQueue
     @ManagedAttributeField
     private ExclusivityPolicy _exclusive;
 
-    private LifetimePolicy _lifetimePolicy;
     private Object _exclusiveOwner; // could be connection, session or Principal
 
     private final Set<NotificationCheck> _notificationChecks =
@@ -303,15 +302,11 @@ public abstract class AbstractQueue
                                                                 Queue.EXCLUSIVE,
                                                                 attributes,
                                                                 ExclusivityPolicy.NONE);
-        _lifetimePolicy = MapValueConverter.getEnumAttribute(LifetimePolicy.class,
-                                                             Queue.LIFETIME_POLICY,
-                                                             attributes,
-                                                             LifetimePolicy.PERMANENT);
 
         final LinkedHashMap<String, Object> arguments = new LinkedHashMap<String, Object>(attributes);
 
         arguments.put(Queue.EXCLUSIVE, _exclusive);
-        arguments.put(Queue.LIFETIME_POLICY, _lifetimePolicy);
+        arguments.put(Queue.LIFETIME_POLICY, getLifetimePolicy());
 
         _arguments = Collections.synchronizedMap(arguments);
         _description = MapValueConverter.getStringAttribute(Queue.DESCRIPTION, attributes, null);
@@ -384,7 +379,7 @@ public abstract class AbstractQueue
         }
 
 
-        if(_lifetimePolicy == LifetimePolicy.DELETE_ON_CONNECTION_CLOSE)
+        if(getLifetimePolicy() == LifetimePolicy.DELETE_ON_CONNECTION_CLOSE)
         {
             if(sessionModel != null)
             {
@@ -393,11 +388,11 @@ public abstract class AbstractQueue
             else
             {
                 throw new IllegalArgumentException("Queues created with a lifetime policy of "
-                                                   + _lifetimePolicy
+                                                   + getLifetimePolicy()
                                                    + " must be created from a connection.");
             }
         }
-        else if(_lifetimePolicy == LifetimePolicy.DELETE_ON_SESSION_END)
+        else if(getLifetimePolicy() == LifetimePolicy.DELETE_ON_SESSION_END)
         {
             if(sessionModel != null)
             {
@@ -406,7 +401,7 @@ public abstract class AbstractQueue
             else
             {
                 throw new IllegalArgumentException("Queues created with a lifetime policy of "
-                                                   + _lifetimePolicy
+                                                   + getLifetimePolicy()
                                                    + " must be created from a connection.");
             }
         }
@@ -425,7 +420,7 @@ public abstract class AbstractQueue
                                  QueueMessages.CREATED(ownerString,
                                                        _entries.getPriorities(),
                                                        ownerString != null,
-                                                       _lifetimePolicy != LifetimePolicy.PERMANENT,
+                                                       getLifetimePolicy() != LifetimePolicy.PERMANENT,
                                                        isDurable(),
                                                        !isDurable(),
                                                        _entries.getPriorities() > 0));
@@ -585,10 +580,6 @@ public abstract class AbstractQueue
             }
             return "standard";
         }
-        else if(LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
         else if(STATE.equals(name))
         {
             return State.ACTIVE; // TODO
@@ -608,12 +599,6 @@ public abstract class AbstractQueue
         return super.getAttribute(name);
     }
 
-    @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return _lifetimePolicy;
-    }
-
     public String getOwner()
     {
         if(_exclusiveOwner != null)
@@ -829,8 +814,8 @@ public abstract class AbstractQueue
             // auto-delete queues must be deleted if there are no remaining subscribers
 
             if(!consumer.isTransient()
-               && ( _lifetimePolicy == LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS
-                    || _lifetimePolicy == LifetimePolicy.DELETE_ON_NO_LINKS )
+               && ( getLifetimePolicy() == LifetimePolicy.DELETE_ON_NO_OUTBOUND_LINKS
+                    || getLifetimePolicy() == LifetimePolicy.DELETE_ON_NO_LINKS )
                && getConsumerCount() == 0)
             {
 
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 3070be413d..ae1963d2a3 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
@@ -23,8 +23,6 @@ package org.apache.qpid.server.queue;
 import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.SUBSCRIPTION_FORMAT;
 
 import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -50,7 +48,6 @@ import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.message.MessageSource;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.State;
@@ -160,6 +157,7 @@ class QueueConsumerImpl
         attributes.put(NO_LOCAL, optionSet.contains(Option.NO_LOCAL));
         attributes.put(DISTRIBUTION_MODE, optionSet.contains(Option.ACQUIRES) ? "MOVE" : "COPY");
         attributes.put(DURABLE,false);
+        attributes.put(LIFETIME_POLICY, LifetimePolicy.DELETE_ON_SESSION_END);
         if(filters != null)
         {
             Iterator<MessageFilter> iter = filters.filters();
@@ -515,24 +513,8 @@ class QueueConsumerImpl
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.DELETE_ON_SESSION_END;
-    }
-
-    @Override
-    public <C extends ConfiguredObject> Collection<C> getChildren(final Class<C> clazz)
-    {
-        return Collections.<C>emptyList();
-    }
-
-    @Override
     public Object getAttribute(final String name)
     {
-        if(LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
         return super.getAttribute(name);
     }
 
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 5a657bf46a..86e034a966 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
@@ -44,7 +44,6 @@ import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.IntegrityViolationException;
 import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.Port;
@@ -107,22 +106,12 @@ public class FileKeyStoreImpl extends AbstractConfiguredObject<FileKeyStoreImpl>
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-    @Override
     public Object getAttribute(String name)
     {
         if(KeyStore.STATE.equals(name))
         {
             return getState();
         }
-        else if(KeyStore.LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
 
         return super.getAttribute(name);
     }
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 bc242e5cc3..6983478ce7 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
@@ -41,7 +41,6 @@ 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.IntegrityViolationException;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.State;
@@ -94,12 +93,6 @@ public class FileTrustStoreImpl extends AbstractConfiguredObject<FileTrustStoreI
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-    @Override
     protected boolean setState(State currentState, State desiredState)
     {
         if(desiredState == State.DELETED)
@@ -209,14 +202,6 @@ public class FileTrustStoreImpl extends AbstractConfiguredObject<FileTrustStoreI
         {
             return getState();
         }
-        else if(DURABLE.equals(name))
-        {
-            return isDurable();
-        }
-        else if(org.apache.qpid.server.model.KeyStore.LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
 
         return super.getAttribute(name);
     }
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 01d517f94d..01281676b1 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
@@ -39,7 +39,6 @@ import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObjectFactory;
 import org.apache.qpid.server.model.IllegalStateTransitionException;
 import org.apache.qpid.server.model.IntegrityViolationException;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Model;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.PreferencesProvider;
@@ -152,12 +151,6 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
         return _state.get();
     }
 
-    @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public <C extends ConfiguredObject> C addChild(Class<C> childClass, Map<String, Object> attributes, ConfiguredObject... otherParents)
@@ -308,14 +301,6 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
         {
             return getState();
         }
-        else if(DURABLE.equals(name))
-        {
-            return isDurable();
-        }
-        else if(LIFETIME_POLICY.equals(name))
-        {
-            return getLifetimePolicy();
-        }
         return super.getAttribute(name);
     }
 }
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 b8a9fb1489..3e756f5210 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
@@ -348,6 +348,9 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
     {
         private final Principal _user;
 
+        @ManagedAttributeField
+        private String _password;
+
         public PrincipalAdapter(Principal user)
         {
             super(parentsMap(PrincipalDatabaseAuthenticationManager.this),createPrincipalAttributes(PrincipalDatabaseAuthenticationManager.this, user),
@@ -379,7 +382,7 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
         @Override
         public String getPassword()
         {
-            return (String)getAttribute(PASSWORD);
+            return _password;
         }
 
         @Override
@@ -403,36 +406,6 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
         }
 
         @Override
-        public LifetimePolicy getLifetimePolicy()
-        {
-            return LifetimePolicy.PERMANENT;
-        }
-
-        @Override
-        public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
-        {
-            return null;
-        }
-
-        @Override
-        public Object getAttribute(String name)
-        {
-            if(ID.equals(name))
-            {
-                return getId();
-            }
-            else if(PASSWORD.equals(name))
-            {
-                return null; // for security reasons we don't expose the password
-            }
-            else if(NAME.equals(name))
-            {
-                return getName();
-            }
-            return super.getAttribute(name);
-        }
-
-        @Override
         public boolean changeAttribute(String name, Object expected, Object desired)
                 throws IllegalStateException, AccessControlException, IllegalArgumentException
         {
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 5decd04274..f9d25e3ec0 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
@@ -50,7 +50,7 @@ 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;
-import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
 import org.apache.qpid.server.model.PreferencesProvider;
@@ -430,6 +430,9 @@ public class ScramSHA1AuthenticationManager
     {
 
         private ScramSHA1AuthenticationManager _authenticationManager;
+        @ManagedAttributeField
+        private String _password;
+
         protected ScramAuthUser(final Map<String, Object> attributes, ScramSHA1AuthenticationManager parent)
         {
             super(parentsMap(parent),
@@ -516,17 +519,13 @@ public class ScramSHA1AuthenticationManager
         @Override
         public Object getAttribute(final String name)
         {
-            if(PASSWORD.equals(name))
-            {
-                return null; // for security reasons we don't expose the password
-            }
             return super.getAttribute(name);
         }
 
         @Override
         public String getPassword()
         {
-            return (String) getActualAttributes().get(PASSWORD);
+            return _password;
         }
 
         @Override
@@ -552,12 +551,6 @@ public class ScramSHA1AuthenticationManager
         }
 
         @Override
-        public LifetimePolicy getLifetimePolicy()
-        {
-            return LifetimePolicy.PERMANENT;
-        }
-
-        @Override
         public <C extends ConfiguredObject> Collection<C> getChildren(final Class<C> clazz)
         {
             return Collections.emptySet();
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 781fce70c0..afdbafff44 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
@@ -381,12 +381,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
 
     }
 
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-
     @Override
     public <C extends ConfiguredObject> Collection<C> getChildren(Class<C> clazz)
     {
@@ -1422,22 +1416,10 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
     @Override
     public Object getAttribute(String name)
     {
-        if(ID.equals(name))
-        {
-            return getId();
-        }
-        else if(STATE.equals(name))
+        if(STATE.equals(name))
         {
             return getState();
         }
-        else if(DURABLE.equals(name))
-        {
-            return isDurable();
-        }
-        else if(LIFETIME_POLICY.equals(name))
-        {
-            return LifetimePolicy.PERMANENT;
-        }
         else if(SUPPORTED_EXCHANGE_TYPES.equals(name))
         {
             List<String> types = new ArrayList<String>();
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 40a0b26487..fa52f33ece 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
@@ -34,7 +34,6 @@ import org.apache.qpid.server.model.AccessControlProvider;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.IllegalStateTransitionException;
-import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.plugin.AccessControlProviderFactory;
@@ -111,23 +110,9 @@ public class ACLFileAccessControlProviderImpl
     }
 
     @Override
-    public LifetimePolicy getLifetimePolicy()
-    {
-        return LifetimePolicy.PERMANENT;
-    }
-
-    @Override
     public Object getAttribute(String name)
     {
-        if(DURABLE.equals(name))
-        {
-            return true;
-        }
-        else if(LIFETIME_POLICY.equals(name))
-        {
-            return LifetimePolicy.PERMANENT;
-        }
-        else if(STATE.equals(name))
+        if(STATE.equals(name))
         {
             return getState();
         }