Author: orudyy
Date: Tue Nov 20 18:52:00 2012
New Revision: 1411793

URL: http://svn.apache.org/viewvc?rev=1411793&view=rev
Log:
 QPID-4390: Add BrokerRecoverer test for attributes, change the status update 
settings

Modified:
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
    
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
 Tue Nov 20 18:52:00 2012
@@ -22,8 +22,7 @@ public class BrokerProperties
     public static final long DEFAULT_MINIMUM_ALERT_REPEAT_GAP = 30000l;
     public static final long DEFAULT_HOUSEKEEPING_PERIOD = 30000L;
 
-    // TODO: delete
-    public static final String PROPERTY_STATUS_UPDATES = "qpid.status_updates";
+    public static final String PROPERTY_NO_STATUS_UPDATES = 
"qpid.no_status_updates";
 
     private BrokerProperties()
     {

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
 Tue Nov 20 18:52:00 2012
@@ -105,7 +105,6 @@ public class ServerConfiguration extends
         envVarMap.put(BrokerProperties.PROPERTY_MINIMUM_ALERT_REPEAT_GAP, 
"minimumAlertRepeatGap");
         envVarMap.put(BrokerProperties.PROPERTY_FLOW_CAPACITY, "capacity");
         envVarMap.put(BrokerProperties.PROPERTY_FLOW_RESUME_CAPACITY, 
"flowResumeCapacity");
-        envVarMap.put(BrokerProperties.PROPERTY_STATUS_UPDATES, 
"status-updates");
     }
 
     /**

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
 Tue Nov 20 18:52:00 2012
@@ -3,7 +3,6 @@ package org.apache.qpid.server.configura
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.ConfigurationEntry;
 import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -12,7 +11,6 @@ import org.apache.qpid.server.model.Auth
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.adapter.AuthenticationProviderAdapter;
 import org.apache.qpid.server.model.adapter.AuthenticationProviderFactory;
 import org.apache.qpid.server.model.adapter.BrokerAdapter;
 import org.apache.qpid.server.model.adapter.PortFactory;
@@ -21,7 +19,6 @@ import org.apache.qpid.server.security.g
 
 public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker>
 {
-    private static final Logger LOGGER = 
Logger.getLogger(BrokerRecoverer.class);
 
     private final IApplicationRegistry _registry;
     private final PortFactory _portFactory;
@@ -62,7 +59,6 @@ public class BrokerRecoverer implements 
         return broker;
     }
 
-    // XXX unit test this
     private void wireUpConfiguredObjects(BrokerAdapter broker, 
Map<String,Object> brokerAttributes)
     {
         AuthenticationProvider defaultAuthenticationProvider = null;
@@ -70,7 +66,7 @@ public class BrokerRecoverer implements 
         int numberOfAuthenticationProviders = authenticationProviders.size();
         if (numberOfAuthenticationProviders == 0)
         {
-               throw new IllegalConfigurationException("No authentication 
provider was onfigured");
+            throw new IllegalConfigurationException("No authentication 
provider was onfigured");
         }
         else if (numberOfAuthenticationProviders == 1)
         {
@@ -81,9 +77,9 @@ public class BrokerRecoverer implements 
             String name = (String) 
brokerAttributes.get(Broker.DEFAULT_AUTHENTICATION_PROVIDER);
             if (name == null)
             {
-               throw new IllegalConfigurationException("Multiple 
authentication providers defined, but no default was configured.");
+                throw new IllegalConfigurationException("Multiple 
authentication providers defined, but no default was configured.");
             }
-            
+
             defaultAuthenticationProvider = 
getAuthenticationProviderByName(broker, name);
         }
         broker.setDefaultAuthenticationProvider(defaultAuthenticationProvider);

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
 Tue Nov 20 18:52:00 2012
@@ -121,6 +121,7 @@ public class XMLConfigurationEntryStore 
         brokerAttributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, 
_serverConfiguration.getMaxDeliveryCount());
         brokerAttributes.put(Broker.DEAD_LETTER_QUEUE_ENABLED, 
_serverConfiguration.isDeadLetterQueueEnabled());
         brokerAttributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, 
_serverConfiguration.getHousekeepingCheckPeriod());
+        brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, 
_serverConfiguration.getDefaultVirtualHost());
 
         brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, 
_serverConfiguration.getDefaultAuthenticationManager());
         ConfigurationEntry rootEntry = new ConfigurationEntry(_rootId, 
Broker.class.getSimpleName(), brokerAttributes,

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
 Tue Nov 20 18:52:00 2012
@@ -65,5 +65,5 @@ public interface AuthenticationProvider 
      */
     SubjectCreator getSubjectCreator();
 
-       void setGroupAccessor(GroupPrincipalAccessor groupPrincipalAccessor);
+    void setGroupAccessor(GroupPrincipalAccessor groupPrincipalAccessor);
 }

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
 Tue Nov 20 18:52:00 2012
@@ -45,6 +45,7 @@ public interface Broker extends Configur
     String TIME_TO_LIVE = "timeToLive";
     String UPDATED = "updated";
     String DEFAULT_AUTHENTICATION_PROVIDER = "defaultAuthenticationProvider";
+    String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
 
     String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
     String ALERT_THRESHOLD_MESSAGE_COUNT = "alertThresholdMessageCount";
@@ -76,6 +77,7 @@ public interface Broker extends Configur
                               TIME_TO_LIVE,
                               UPDATED,
                               DEFAULT_AUTHENTICATION_PROVIDER,
+                              DEFAULT_VIRTUAL_HOST,
                               ALERT_THRESHOLD_MESSAGE_AGE,
                               ALERT_THRESHOLD_MESSAGE_COUNT,
                               ALERT_THRESHOLD_QUEUE_DEPTH,

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
 Tue Nov 20 18:52:00 2012
@@ -23,6 +23,7 @@ package org.apache.qpid.server.model.ada
 import static org.apache.qpid.server.util.MapValueConverter.getLongAttribute;
 import static 
org.apache.qpid.server.util.MapValueConverter.getIntegerAttribute;
 import static 
org.apache.qpid.server.util.MapValueConverter.getBooleanAttribute;
+import static org.apache.qpid.server.util.MapValueConverter.getStringAttribute;
 
 import java.security.AccessControlException;
 import java.util.ArrayList;
@@ -82,7 +83,7 @@ public class BrokerAdapter extends Abstr
     private int _maximumDeliveryCount;
     private boolean _deadLetterQueueEnabled;
     private long _housekeepingCheckPeriod;
-
+    private String _defaultVirtualHost;
 
     public BrokerAdapter(UUID id, Map<String, Object> attributes, 
IApplicationRegistry instance,
             AuthenticationProviderFactory authenticationProviderFactory, 
PortFactory portFactory)
@@ -105,6 +106,7 @@ public class BrokerAdapter extends Abstr
         _maximumDeliveryCount = getIntegerAttribute(MAXIMUM_DELIVERY_ATTEMPTS, 
attributes, 0);
         _deadLetterQueueEnabled = 
getBooleanAttribute(DEAD_LETTER_QUEUE_ENABLED, attributes, false);
         _housekeepingCheckPeriod = getLongAttribute(HOUSEKEEPING_CHECK_PERIOD, 
attributes, Long.getLong(BrokerProperties.PROPERTY_HOUSE_KEEPING_CHECK_PERIOD, 
BrokerProperties.DEFAULT_HOUSEKEEPING_PERIOD));
+        _defaultVirtualHost = getStringAttribute(DEFAULT_VIRTUAL_HOST, 
attributes, null);
     }
 
     public Collection<VirtualHost> getVirtualHosts()
@@ -452,9 +454,13 @@ public class BrokerAdapter extends Abstr
         {
             // TODO
         }
-        else if (DEFAULT_AUTHENTICATION_PROVIDER.equals(name))
+        else if (DEFAULT_AUTHENTICATION_PROVIDER.equals(name) && 
_defaultAuthenticationProvider != null)
+        {
+            return _defaultAuthenticationProvider.getName();
+        }
+        else if (DEFAULT_VIRTUAL_HOST.equals(name) && _defaultVirtualHost != 
null)
         {
-            return getDefaultAuthenticationProvider();
+            return _defaultVirtualHost;
         }
         else if (ALERT_THRESHOLD_MESSAGE_AGE.equals(name))
         {

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
 Tue Nov 20 18:52:00 2012
@@ -31,6 +31,7 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.log4j.Logger;
 import org.apache.qpid.common.Closeable;
 import org.apache.qpid.common.QpidProperties;
+import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.ConfigurationEntryStore;
 import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
 import org.apache.qpid.server.configuration.RecovererProvider;
@@ -202,8 +203,8 @@ public class ApplicationRegistry impleme
             BrokerMessages.reload();
 
             // Create the RootLogger to be used during broker operation
-            // XXX this setting should be retrieved from the broker
-            _rootMessageLogger = new 
Log4jMessageLogger(configuration.getStatusUpdatesEnabled()); // 
_broker.getStatusUpdatesEnabled()
+            _rootMessageLogger = new 
Log4jMessageLogger(!Boolean.getBoolean(BrokerProperties.PROPERTY_NO_STATUS_UPDATES));
+            initialiseStatisticsReporting();
 
             CurrentActor.setDefault(new BrokerActor(_rootMessageLogger));
             GenericActor.setDefaultMessageLogger(_rootMessageLogger);

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
 Tue Nov 20 18:52:00 2012
@@ -77,6 +77,42 @@ public class BrokerRecovererTest extends
         _brokerEntryChildren.put(AuthenticationProvider.class.getSimpleName(), 
Arrays.asList(_authenticationProviderEntry1));
     }
 
+    public void testCreateBrokerAttributes()
+    {
+        String[] attributesNames = { Broker.DEFAULT_VIRTUAL_HOST, 
Broker.DEFAULT_AUTHENTICATION_PROVIDER, Broker.ALERT_THRESHOLD_MESSAGE_AGE,
+                Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 
Broker.ALERT_THRESHOLD_QUEUE_DEPTH, Broker.ALERT_THRESHOLD_MESSAGE_SIZE,
+                Broker.ALERT_REPEAT_GAP, Broker.FLOW_CONTROL_SIZE_BYTES, 
Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, Broker.MAXIMUM_DELIVERY_ATTEMPTS,
+                Broker.DEAD_LETTER_QUEUE_ENABLED, 
Broker.HOUSEKEEPING_CHECK_PERIOD };
+        Object[] attributeValues = { "test", "authenticationProvider1", 9l, 
8l, 7l, 6l, 5l, 4l, 3l, 2, true, 1l };
+        Map<String, Object> attributes = new HashMap<String, Object>();
+
+        for (int i = 0; i < attributesNames.length; i++)
+        {
+            attributes.put(attributesNames[i], 
String.valueOf(attributeValues[i]));
+        }
+
+        when(_brokerEntry.getAttributes()).thenReturn(attributes);
+
+        final ConfigurationEntry virtualHostEntry = 
mock(ConfigurationEntry.class);
+        String typeName = VirtualHost.class.getSimpleName();
+        when(virtualHostEntry.getType()).thenReturn(typeName);
+        _brokerEntryChildren.put(typeName, Arrays.asList(virtualHostEntry));
+        final VirtualHost virtualHost = mock(VirtualHost.class);
+        when(virtualHost.getName()).thenReturn("test");
+
+        RecovererProvider recovererProvider = createRecoveryProvider(new 
ConfigurationEntry[] { virtualHostEntry, _authenticationProviderEntry1 },
+                new ConfiguredObject[] { virtualHost, _authenticationProvider1 
});
+        Broker broker = _brokerRecoverer.create(recovererProvider, 
_brokerEntry);
+        assertNotNull(broker);
+        assertEquals(_brokerId, broker.getId());
+
+        for (int i = 0; i < attributesNames.length; i++)
+        {
+            Object attributeValue = broker.getAttribute(attributesNames[i]);
+            assertEquals("Unexpected value of attribute '" + 
attributesNames[i] + "'", attributeValues[i], attributeValue);
+        }
+    }
+
     public void testCreateBrokerWithVirtualHost()
     {
         final ConfigurationEntry virtualHostEntry = 
mock(ConfigurationEntry.class);
@@ -96,8 +132,6 @@ public class BrokerRecovererTest extends
         assertEquals(_brokerId, broker.getId());
         assertEquals(1, broker.getVirtualHosts().size());
         assertEquals(virtualHost, broker.getVirtualHosts().iterator().next());
-
-        // XXX test top-level attributes eg status-updates
     }
 
     public void testCreateBrokerWithPorts()

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
 Tue Nov 20 18:52:00 2012
@@ -32,6 +32,7 @@ import org.apache.qpid.framing.ContentHe
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.logging.SystemOutMessageLogger;
 import org.apache.qpid.server.logging.actors.CurrentActor;

Modified: 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java?rev=1411793&r1=1411792&r2=1411793&view=diff
==============================================================================
--- 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
 (original)
+++ 
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
 Tue Nov 20 18:52:00 2012
@@ -27,6 +27,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.ConfigurationUtils;
 import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.ConfigurationEntryStore;
 import org.apache.qpid.server.configuration.store.XMLConfigurationEntryStore;
 import org.apache.qpid.server.logging.NullRootMessageLogger;
@@ -48,6 +49,7 @@ public class TestApplicationRegistry ext
     @Override
     public void initialise() throws Exception
     {
+        System.setProperty(BrokerProperties.PROPERTY_NO_STATUS_UPDATES, 
"true");
         LoggingManagementFacade.configure("test-profiles/log4j-test.xml");
 
         super.initialise();
@@ -56,6 +58,19 @@ public class TestApplicationRegistry ext
         GenericActor.setDefaultMessageLogger(new NullRootMessageLogger());
     }
 
+    @Override
+    public void close()
+    {
+        try
+        {
+            super.close();
+        }
+        finally
+        {
+            System.clearProperty(BrokerProperties.PROPERTY_NO_STATUS_UPDATES);
+        }
+    }
+
     private static ConfigurationEntryStore createStore(Configuration config) 
throws ConfigurationException
     {
         File file;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to