QPID-5579 : Remove unused constants

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

37 files changed, 103 insertions, 232 deletions

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 711bcbfda9..8d225ad64c 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
@@ -28,13 +28,10 @@ import org.apache.qpid.server.security.AccessControl;
 
 public interface AccessControlProvider<X extends AccessControlProvider<X>> extends ConfiguredObject<X>
 {
-    public static final String DESCRIPTION = "description";
     public static final String STATE = "state";
     public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TIME_TO_LIVE = "timeToLive";
-    public static final String CREATED = "created";
-    public static final String UPDATED = "updated";
     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 6c6c8b8c66..d75ad83025 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,8 +34,6 @@ public interface AuthenticationProvider<X extends AuthenticationProvider<X>> ext
     public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TIME_TO_LIVE = "timeToLive";
-    public static final String CREATED = "created";
-    public static final String UPDATED = "updated";
 
     //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 030c7ce610..46ccb72f40 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
@@ -41,12 +41,10 @@ public interface Binding<X extends Binding<X>> extends ConfiguredObject<X>
 
 
     public String ARGUMENTS = "arguments";
-    public String CREATED = "created";
     public String DURABLE = "durable";
     public String LIFETIME_POLICY = "lifetimePolicy";
     public String STATE = "state";
     public String TIME_TO_LIVE = "timeToLive";
-    public String UPDATED = "updated";
     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 65f1429987..9a309c8bcd 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
@@ -36,7 +36,6 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>
 {
 
     String BUILD_VERSION = "buildVersion";
-    String BYTES_RETAINED = "bytesRetained";
     String OPERATING_SYSTEM = "operatingSystem";
     String PLATFORM = "platform";
     String PROCESS_PID = "processPid";
@@ -46,12 +45,10 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X>
     String SUPPORTED_VIRTUALHOST_STORE_TYPES = "supportedVirtualHostStoreTypes";
     String SUPPORTED_AUTHENTICATION_PROVIDERS = "supportedAuthenticationProviders";
     String SUPPORTED_PREFERENCES_PROVIDER_TYPES = "supportedPreferencesProviderTypes";
-    String CREATED = "created";
     String DURABLE = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE = "state";
     String TIME_TO_LIVE = "timeToLive";
-    String UPDATED = "updated";
     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/Connection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
index 061d82fe5e..c3f75f02f0 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
@@ -64,8 +64,6 @@ public interface Connection<X extends Connection<X>> extends ConfiguredObject<X>
     public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TIME_TO_LIVE = "timeToLive";
-    public static final String CREATED = "created";
-    public static final String UPDATED = "updated";
 
     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 54b81c724d..86860f5164 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
@@ -31,12 +31,10 @@ 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 CREATED = "created";
     public String DURABLE = "durable";
     public String LIFETIME_POLICY = "lifetimePolicy";
     public String STATE = "state";
     public String TIME_TO_LIVE = "timeToLive";
-    public String UPDATED = "updated";
 
     @ManagedAttribute
     String getDistributionMode();
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 f788a07c4b..608397dd2b 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
@@ -47,12 +47,10 @@ public interface Exchange<X extends Exchange<X>> extends ConfiguredObject<X>
                                   PRODUCER_COUNT,
                                   STATE_CHANGED));
 
-    String CREATED                              = "created";
     String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String STATE                                = "state";
     String TIME_TO_LIVE                         = "timeToLive";
-    String UPDATED                              = "updated";
     String ALTERNATE_EXCHANGE                   = "alternateExchange";
 
     // Attributes
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 47a467f7c4..df5d108914 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
@@ -21,11 +21,9 @@ package org.apache.qpid.server.model;
 
 public interface Group<X extends Group<X>> extends ConfiguredObject<X>
 {
-    String CREATED         = "created";
     String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
     String TIME_TO_LIVE    = "timeToLive";
-    String UPDATED         = "updated";
 
 }
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 5b7720f8e4..154be964b9 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
@@ -25,11 +25,9 @@ import java.util.Collections;
 
 public interface GroupMember<X extends GroupMember<X>> extends ConfiguredObject<X>
 {
-    String CREATED         = "created";
     String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
     String TIME_TO_LIVE    = "timeToLive";
-    String UPDATED         = "updated";
 
 }
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 35fa7e6ac5..e47d6828d9 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
@@ -32,22 +32,6 @@ public interface GroupProvider<X extends GroupProvider<X>> extends ConfiguredObj
     public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TIME_TO_LIVE = "timeToLive";
-    public static final String CREATED = "created";
-    public static final String UPDATED = "updated";
-    public static final String TYPE = "type";
-
-    public static final Collection<String> AVAILABLE_ATTRIBUTES =
-            Collections.unmodifiableList(
-                    Arrays.asList(ID,
-                                  NAME,
-                                  DESCRIPTION,
-                                  STATE,
-                                  DURABLE,
-                                  LIFETIME_POLICY,
-                                  TIME_TO_LIVE,
-                                  CREATED,
-                                  UPDATED,
-                                  TYPE));
 
     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 6d425492ea..cb985f113f 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
@@ -32,8 +32,6 @@ public interface KeyStore<X extends KeyStore<X>> extends ConfiguredObject<X>
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE = "state";
     String TIME_TO_LIVE = "timeToLive";
-    String CREATED = "created";
-    String UPDATED = "updated";
     String DESCRIPTION = "description";
 
     String PATH = "path";
@@ -42,25 +40,6 @@ public interface KeyStore<X extends KeyStore<X>> extends ConfiguredObject<X>
     String CERTIFICATE_ALIAS = "certificateAlias";
     String KEY_MANAGER_FACTORY_ALGORITHM = "keyManagerFactoryAlgorithm";
 
-    public static final Collection<String> AVAILABLE_ATTRIBUTES =
-            Collections.unmodifiableList(
-                    Arrays.asList(
-                            ID,
-                            NAME,
-                            STATE,
-                            DURABLE,
-                            LIFETIME_POLICY,
-                            TIME_TO_LIVE,
-                            CREATED,
-                            UPDATED,
-                            DESCRIPTION,
-                            PATH,
-                            PASSWORD,
-                            KEY_STORE_TYPE,
-                            CERTIFICATE_ALIAS,
-                            KEY_MANAGER_FACTORY_ALGORITHM
-                                 ));
-
     @ManagedAttribute( secure = true )
     public String getPassword();
     
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 bb8a8b9ecd..ae68aeb670 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
@@ -27,12 +27,10 @@ import java.util.Collections;
 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 CREATED                              = "created";
     String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String STATE                                = "state";
     String TIME_TO_LIVE                         = "timeToLive";
-    String UPDATED                              = "updated";
 
     // Attributes
 
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 b443bd2804..41b29aad08 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
@@ -28,12 +28,10 @@ import java.util.List;
 
 public interface Port<X extends Port<X>> extends ConfiguredObject<X>
 {
-    String CREATED                              = "created";
     String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String STATE                                = "state";
     String TIME_TO_LIVE                         = "timeToLive";
-    String UPDATED                              = "updated";
     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 18ace288e4..cf36178022 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
@@ -29,27 +29,11 @@ import java.util.Set;
 
 public interface PreferencesProvider<X extends PreferencesProvider<X>> extends ConfiguredObject<X>
 {
-    String CREATED         = "created";
-    String UPDATED         = "updated";
     String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
     String TIME_TO_LIVE    = "timeToLive";
 
-    Collection<String> AVAILABLE_ATTRIBUTES =
-           Collections.unmodifiableList(
-                   Arrays.asList(
-                           ID,
-                           NAME,
-                           STATE,
-                           TYPE,
-                           CREATED,
-                           UPDATED,
-                           DURABLE,
-                           LIFETIME_POLICY,
-                           TIME_TO_LIVE
-                   ));
-
     /**
      * Returns preferences {@link Map} for a given user ID
      * @param userId user ID to retrieve preferences for
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 a6cd7cc9d6..86ab4efdce 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
@@ -55,8 +55,6 @@ public interface Session<X extends Session<X>> extends ConfiguredObject<X>
     public static final String DURABLE = "durable";
     public static final String LIFETIME_POLICY = "lifetimePolicy";
     public static final String TIME_TO_LIVE = "timeToLive";
-    public static final String CREATED = "created";
-    public static final String UPDATED = "updated";
 
     public static final String CHANNEL_ID = "channelId";
     // PRODUCER_FLOW_BLOCKED is exposed as an interim step.  We will expose attribute(s) that exposing
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 3c660ac3a6..bba7b8c11e 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
@@ -32,8 +32,6 @@ public interface TrustStore<X extends TrustStore<X>> extends ConfiguredObject<X>
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE = "state";
     String TIME_TO_LIVE = "timeToLive";
-    String CREATED = "created";
-    String UPDATED = "updated";
     String DESCRIPTION = "description";
 
     String PATH = "path";
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 b242080e03..cef011a6f7 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
@@ -28,31 +28,15 @@ import java.util.Map;
 
 public interface User<X extends User<X>> extends ConfiguredObject<X>
 {
-    String CREATED         = "created";
     String DURABLE         = "durable";
     String LIFETIME_POLICY = "lifetimePolicy";
     String STATE           = "state";
     String TIME_TO_LIVE    = "timeToLive";
-    String UPDATED         = "updated";
     String PASSWORD        = "password";
 
     // Attributes
-    public static final Collection<String> AVAILABLE_ATTRIBUTES =
-           Collections.unmodifiableList(
-                   Arrays.asList(
-                           ID,
-                           NAME,
-                           STATE,
-                           DURABLE,
-                           LIFETIME_POLICY,
-                           TIME_TO_LIVE,
-                           CREATED,
-                           UPDATED,
-                           PASSWORD
-                   ));
 
-
-    @ManagedAttribute
+    @ManagedAttribute( secure = 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 8fb1a306e9..46bcdf3ac1 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
@@ -80,12 +80,10 @@ public interface VirtualHost<X extends VirtualHost<X>> extends ConfiguredObject<
     String CONFIG_STORE_PATH                    = "configStorePath";
     String SUPPORTED_EXCHANGE_TYPES             = "supportedExchangeTypes";
     String SUPPORTED_QUEUE_TYPES                = "supportedQueueTypes";
-    String CREATED                              = "created";
     String DURABLE                              = "durable";
     String LIFETIME_POLICY                      = "lifetimePolicy";
     String STATE                                = "state";
     String TIME_TO_LIVE                         = "timeToLive";
-    String UPDATED                              = "updated";
     String CONFIG_PATH                          = "configPath";
 
     // Attributes
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
index 315584c4d5..51a5344c00 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.server.model.adapter;
 
 import java.security.AccessControlException;
+import java.security.AccessController;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -33,8 +34,12 @@ import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.Statistics;
 import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.util.MapValueConverter;
 
+import javax.security.auth.Subject;
+
 public abstract class AbstractKeyStoreAdapter<X extends ConfiguredObject<X>> extends AbstractConfiguredObject<X>
 {
     public static final String DUMMY_PASSWORD_MASK = "********";
@@ -154,23 +159,9 @@ public abstract class AbstractKeyStoreAdapter<X extends ConfiguredObject<X>> ext
         {
             return getTimeToLive();
         }
-        else if(KeyStore.CREATED.equals(name))
-        {
-
-        }
-        else if(KeyStore.UPDATED.equals(name))
-        {
-
-        }
         else if(KeyStore.PASSWORD.equals(name))
         {
-            // For security reasons we don't expose the password
-            if (getPassword() != null)
-            {
-                return DUMMY_PASSWORD_MASK;
-            }
-
-            return null;
+            return getPassword();
         }
 
         return super.getAttribute(name);
@@ -178,7 +169,15 @@ public abstract class AbstractKeyStoreAdapter<X extends ConfiguredObject<X>> ext
 
     public String getPassword()
     {
-        return _password;
+        // For security reasons we don't expose the password unless running as the system user
+        if(SecurityManager.SYSTEM.equals(Subject.getSubject(AccessController.getContext())))
+        {
+            return _password;
+        }
+        else
+        {
+            return DUMMY_PASSWORD_MASK;
+        }
     }
 
     public void setPassword(String password)
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 ab33933eec..269c615743 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
@@ -137,14 +137,6 @@ public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends Abstrac
         {
             return getTimeToLive();
         }
-        else if (CREATED.equals(name))
-        {
-
-        }
-        else if (UPDATED.equals(name))
-        {
-
-        }
         return super.getAttribute(name);
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
index 3b69c66d7e..8bc8f2bc72 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AccessControlProviderAdapter.java
@@ -159,11 +159,7 @@ public class AccessControlProviderAdapter extends AbstractConfiguredObject<Acces
     @Override
     public Object getAttribute(String name)
     {
-        if(CREATED.equals(name))
-        {
-            // TODO
-        }
-        else if(DURABLE.equals(name))
+        if(DURABLE.equals(name))
         {
             return true;
         }
@@ -183,10 +179,6 @@ public class AccessControlProviderAdapter extends AbstractConfiguredObject<Acces
         {
             // TODO
         }
-        else if(UPDATED.equals(name))
-        {
-            // TODO
-        }
         return super.getAttribute(name);
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
index bf244975ee..f77db240a1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
@@ -171,11 +171,7 @@ public abstract class AuthenticationProviderAdapter<X extends AuthenticationProv
     @Override
     public Object getAttribute(String name)
     {
-        if(CREATED.equals(name))
-        {
-            // TODO
-        }
-        else if(DURABLE.equals(name))
+        if(DURABLE.equals(name))
         {
             return true;
         }
@@ -195,10 +191,6 @@ public abstract class AuthenticationProviderAdapter<X extends AuthenticationProv
         {
             // TODO
         }
-        else if(UPDATED.equals(name))
-        {
-            // TODO
-        }
         return super.getAttribute(name);
     }
 
@@ -693,7 +685,7 @@ public abstract class AuthenticationProviderAdapter<X extends AuthenticationProv
             @Override
             public Collection<String> getAttributeNames()
             {
-                return User.AVAILABLE_ATTRIBUTES;
+                return Attribute.getAttributeNames(User.class);
             }
 
             @Override
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
index 5983596b17..813f4e63df 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
@@ -161,14 +161,6 @@ final class BindingAdapter extends AbstractConfiguredObject<BindingAdapter> impl
         {
 
         }
-        else if(CREATED.equals(name))
-        {
-
-        }
-        else if(UPDATED.equals(name))
-        {
-
-        }
         else if(EXCHANGE.equals(name))
         {
             return _exchange.getName();
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 95af3ec74c..c4b21bb067 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
@@ -915,22 +915,10 @@ public class BrokerAdapter<X extends Broker<X>> extends AbstractConfiguredObject
         {
             // TODO
         }
-        else if(CREATED.equals(name))
-        {
-            // TODO
-        }
-        else if(UPDATED.equals(name))
-        {
-            // TODO
-        }
         else if(BUILD_VERSION.equals(name))
         {
             return QpidProperties.getBuildVersion();
         }
-        else if(BYTES_RETAINED.equals(name))
-        {
-            // TODO
-        }
         else if(OPERATING_SYSTEM.equals(name))
         {
             return SystemUtils.getOSString();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
index 2573390851..5150154c0a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
@@ -138,14 +138,6 @@ public class ConsumerAdapter extends AbstractConfiguredObject<ConsumerAdapter> i
         {
 
         }
-        else if(CREATED.equals(name))
-        {
-
-        }
-        else if(UPDATED.equals(name))
-        {
-
-        }
         else if(DISTRIBUTION_MODE.equals(name))
         {
             return _consumer.acquires() ? "MOVE" : "COPY";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
index 704be692b4..50a28678e8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
@@ -318,14 +318,6 @@ final class ExchangeAdapter extends AbstractConfiguredObject<ExchangeAdapter> im
         {
 
         }
-        else if(CREATED.equals(name))
-        {
-
-        }
-        else if(UPDATED.equals(name))
-        {
-
-        }
         else if(ALTERNATE_EXCHANGE.equals(name))
         {
             org.apache.qpid.server.exchange.Exchange alternateExchange = _exchange.getAlternateExchange();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
index bc43617a26..b0aae6af77 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
@@ -173,11 +173,7 @@ public class FileSystemPreferencesProvider extends AbstractConfiguredObject<File
     @Override
     public Object getAttribute(String name)
     {
-        if (CREATED.equals(name))
-        {
-            // TODO
-        }
-        else if (DURABLE.equals(name))
+        if (DURABLE.equals(name))
         {
             return true;
         }
@@ -197,10 +193,6 @@ public class FileSystemPreferencesProvider extends AbstractConfiguredObject<File
         {
             // TODO
         }
-        else if (UPDATED.equals(name))
-        {
-            // TODO
-        }
         return super.getAttribute(name);
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
index 559bdeb6f0..587840c00f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
@@ -160,11 +160,7 @@ public class GroupProviderAdapter extends AbstractConfiguredObject<GroupProvider
     @Override
     public Object getAttribute(String name)
     {
-        if (CREATED.equals(name))
-        {
-            // TODO
-        }
-        else if (DURABLE.equals(name))
+        if (DURABLE.equals(name))
         {
             return true;
         }
@@ -184,10 +180,7 @@ public class GroupProviderAdapter extends AbstractConfiguredObject<GroupProvider
         {
             // TODO
         }
-        else if (UPDATED.equals(name))
-        {
-            // TODO
-        }
+
         return super.getAttribute(name);
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
index 1ebdb7af4b..9a00e4db37 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/KeyStoreAdapter.java
@@ -26,6 +26,7 @@ import java.security.AccessControlException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
 import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,6 +37,7 @@ import java.util.UUID;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
+import javax.security.auth.Subject;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Attribute;
@@ -44,6 +46,8 @@ import org.apache.qpid.server.model.IntegrityViolationException;
 import org.apache.qpid.server.model.KeyStore;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.util.MapValueConverter;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -76,7 +80,14 @@ public class KeyStoreAdapter extends AbstractKeyStoreAdapter<KeyStoreAdapter> im
         _broker = broker;
 
         String keyStorePath = (String)getAttribute(KeyStore.PATH);
-        String keyStorePassword = getPassword();
+        String keyStorePassword = Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<String>()
+        {
+            @Override
+            public String run()
+            {
+                return getPassword();
+            }
+        });
         String keyStoreType = (String)getAttribute(KeyStore.KEY_STORE_TYPE);
         String keyManagerFactoryAlgorithm = (String)getAttribute(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM);
         String certAlias = (String)getAttribute(KeyStore.CERTIFICATE_ALIAS);
@@ -250,7 +261,14 @@ public class KeyStoreAdapter extends AbstractKeyStoreAdapter<KeyStoreAdapter> im
     public KeyManager[] getKeyManagers() throws GeneralSecurityException
     {
         String keyStorePath = (String)getAttribute(KeyStore.PATH);
-        String keyStorePassword = getPassword();
+        String keyStorePassword = Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<String>()
+                                    {
+                                        @Override
+                                        public String run()
+                                        {
+                                            return getPassword();
+                                        }
+                                    });
         String keyStoreType = (String)getAttribute(KeyStore.KEY_STORE_TYPE);
         String keyManagerFactoryAlgorithm = (String)getAttribute(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM);
         String certAlias = (String)getAttribute(KeyStore.CERTIFICATE_ALIAS);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
index dcad57c7a4..c1d501b5ad 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
@@ -273,14 +273,6 @@ abstract public class PortAdapter<X extends PortAdapter<X>> extends AbstractConf
         {
             return getTimeToLive();
         }
-        else if(CREATED.equals(name))
-        {
-
-        }
-        else if(UPDATED.equals(name))
-        {
-
-        }
         return super.getAttribute(name);
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
index 65b7a88bb9..5b03ab051a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
@@ -26,6 +26,7 @@ import java.security.AccessControlException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,6 +38,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
 import javax.net.ssl.X509TrustManager;
+import javax.security.auth.Subject;
+
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Attribute;
 import org.apache.qpid.server.model.AuthenticationProvider;
@@ -45,6 +48,8 @@ import org.apache.qpid.server.model.IntegrityViolationException;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManagerFactory;
 import org.apache.qpid.server.util.MapValueConverter;
@@ -79,7 +84,14 @@ public class TrustStoreAdapter extends AbstractKeyStoreAdapter<TrustStoreAdapter
         _broker = broker;
 
         String trustStorePath = (String) getAttribute(TrustStore.PATH);
-        String trustStorePassword = getPassword();
+        String trustStorePassword = Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<String>()
+        {
+            @Override
+            public String run()
+            {
+                return getPassword();
+            }
+        });
         String trustStoreType = (String) getAttribute(TrustStore.TRUST_STORE_TYPE);
         String trustManagerFactoryAlgorithm = (String) getAttribute(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
 
@@ -238,7 +250,15 @@ public class TrustStoreAdapter extends AbstractKeyStoreAdapter<TrustStoreAdapter
     public TrustManager[] getTrustManagers() throws GeneralSecurityException
     {
         String trustStorePath = (String)getAttribute(TrustStore.PATH);
-        String trustStorePassword = getPassword();
+        String trustStorePassword = Subject.doAs(org.apache.qpid.server.security.SecurityManager.SYSTEM,
+                                                 new PrivilegedAction<String>()
+                                                 {
+                                                     @Override
+                                                     public String run()
+                                                     {
+                                                         return getPassword();
+                                                     }
+                                                 });
         String trustStoreType = (String)getAttribute(TrustStore.TRUST_STORE_TYPE);
         String trustManagerFactoryAlgorithm = (String)getAttribute(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
index 65b658b22a..6f51f0c2cc 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
@@ -817,14 +817,6 @@ public final class VirtualHostAdapter extends AbstractConfiguredObject<VirtualHo
         {
             // TODO
         }
-        else if(CREATED.equals(name))
-        {
-            // TODO
-        }
-        else if(UPDATED.equals(name))
-        {
-            // TODO
-        }
         else if (_virtualHost != null)
         {
             return getAttributeFromVirtualHostImplementation(name);
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
index 1014f227a0..b774f4a478 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
@@ -23,11 +23,13 @@ package org.apache.qpid.server.configuration.startup;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 import javax.net.ssl.KeyManagerFactory;
+import javax.security.auth.Subject;
 
 import junit.framework.TestCase;
 
@@ -35,6 +37,8 @@ import org.apache.qpid.server.configuration.ConfigurationEntry;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.KeyStore;
 import org.apache.qpid.server.model.adapter.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.test.utils.TestSSLConstants;
 
 public class KeyStoreRecovererTest extends TestCase
@@ -52,17 +56,25 @@ public class KeyStoreRecovererTest extends TestCase
         when(entry.getId()).thenReturn(id);
 
         KeyStoreRecoverer recoverer = new KeyStoreRecoverer();
+        final KeyStore keyStore = recoverer.create(null, entry, broker);
 
-        KeyStore keyStore = recoverer.create(null, entry, broker);
         assertNotNull("Key store configured object is not created", keyStore);
         assertEquals(id, keyStore.getId());
 
         //verify we can retrieve the actual password using the method
-        assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, keyStore.getPassword());
-        assertNotNull(keyStore.getPassword());
+        Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<Object>()
+        {
+            @Override
+            public Object run()
+            {
+                assertNotNull(keyStore.getPassword());
+                assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, keyStore.getPassword());
+                //verify that we haven't configured the key store with the actual dummy password value
+                assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(keyStore.getPassword()));
+                return null;
+            }
+        });
 
-        //verify that we haven't configured the key store with the actual dummy password value
-        assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(keyStore.getPassword()));
 
         // Verify the remaining attributes, including that the password value returned
         // via getAttribute is actually the dummy value and not the real password
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
index f0637f3628..6ba53007dd 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
@@ -23,16 +23,20 @@ package org.apache.qpid.server.configuration.startup;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.security.PrivilegedAction;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.Subject;
 
 import org.apache.qpid.server.configuration.ConfigurationEntry;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.TrustStore;
 import org.apache.qpid.server.model.adapter.AbstractKeyStoreAdapter;
+import org.apache.qpid.server.security.*;
+import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.test.utils.TestSSLConstants;
 
@@ -51,16 +55,24 @@ public class TrustStoreRecovererTest extends QpidTestCase
 
         TrustStoreRecoverer recoverer = new TrustStoreRecoverer();
 
-        TrustStore trustStore = recoverer.create(null, entry, broker);
+        final TrustStore trustStore = recoverer.create(null, entry, broker);
         assertNotNull("Trust store configured object is not created", trustStore);
         assertEquals(id, trustStore.getId());
 
-        //verify we can retrieve the actual password using the method
-        assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, trustStore.getPassword());
-        assertNotNull(trustStore.getPassword());
+        Subject.doAs(SecurityManager.SYSTEM, new PrivilegedAction<Object>()
+        {
+            @Override
+            public Object run()
+            {
+                //verify we can retrieve the actual password using the method
+                assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, trustStore.getPassword());
+                assertNotNull(trustStore.getPassword());
+                //verify that we haven't configured the trust store with the actual dummy password value
+                assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(trustStore.getPassword()));
+                return null;
+            }
+        });
 
-        //verify that we haven't configured the trust store with the actual dummy password value
-        assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(trustStore.getPassword()));
 
         // Verify the remaining attributes, including that the password value returned
         // via getAttribute is actually the dummy value and not the real password
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
index 07c1e7c8b8..6c6ce940de 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
@@ -64,8 +64,8 @@ public class BrokerRestHttpsTest extends QpidRestTestCase
     {
         Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
 
-        Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class), Broker.BYTES_RETAINED,
-                Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE,
+        Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
+                Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
                 ConfiguredObject.CREATED_TIME,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index 76b4e7eefb..ab4f358b42 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -235,7 +235,7 @@ public class BrokerRestTest extends QpidRestTestCase
     protected void assertBrokerAttributes(Map<String, Object> brokerDetails)
     {
         Asserts.assertAttributesPresent(brokerDetails, Attribute.getAttributeNames(Broker.class),
-                Broker.BYTES_RETAINED, Broker.PROCESS_PID,
+                Broker.PROCESS_PID,
                 Broker.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
index cecf4b2ab5..89c53b1e0a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
@@ -183,7 +183,7 @@ public class ConnectionRestTest extends QpidRestTestCase
                                         ConfiguredObject.DESCRIPTION,
                                         Session.STATE,
                                         Session.DURABLE,
-                Session.LIFETIME_POLICY, Session.TIME_TO_LIVE, Session.CREATED, Session.UPDATED);
+                Session.LIFETIME_POLICY, Session.TIME_TO_LIVE);
         assertEquals("Unexpecte value of attribute " + Session.NAME, session.getChannelId() + "",
                 sessionData.get(Session.NAME));
         assertEquals("Unexpecte value of attribute " + Session.PRODUCER_FLOW_BLOCKED, Boolean.FALSE,