diff options
Diffstat (limited to 'qpid/java')
12 files changed, 100 insertions, 78 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 a6f2ad8633..9fdae72188 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 @@ -55,7 +55,6 @@ public class BindingImpl private final UUID _id; private final AtomicLong _matches = new AtomicLong(); private final BindingLogSubject _logSubject; - private final EventLogger _eventLogger; final AtomicBoolean _deleted = new AtomicBoolean(); final CopyOnWriteArrayList<StateChangeListener<BindingImpl,State>> _stateChangeListeners = @@ -91,14 +90,14 @@ public class BindingImpl _exchange = exchange; Map<String,Object> arguments = (Map<String, Object>) attributes.get(org.apache.qpid.server.model.Binding.ARGUMENTS); _arguments = arguments == null ? Collections.EMPTY_MAP : Collections.unmodifiableMap(arguments); - _eventLogger = exchange.getEventLogger(); + //Perform ACLs queue.getVirtualHost().getSecurityManager().authoriseCreateBinding(this); _logSubject = new BindingLogSubject(_bindingKey,exchange,queue); - _eventLogger.message(_logSubject, BindingMessages.CREATED(String.valueOf(getArguments()), - getArguments() != null - && !getArguments().isEmpty())); + getEventLogger().message(_logSubject, BindingMessages.CREATED(String.valueOf(getArguments()), + getArguments() != null + && !getArguments().isEmpty())); } @@ -231,7 +230,7 @@ public class BindingImpl { listener.stateChanged(this, State.ACTIVE, State.DELETED); } - _eventLogger.message(_logSubject, BindingMessages.DELETED()); + getEventLogger().message(_logSubject, BindingMessages.DELETED()); } } @@ -321,4 +320,9 @@ public class BindingImpl { throw new UnsupportedOperationException("Changing attributes on binding is not supported."); } + + private EventLogger getEventLogger() + { + return _exchange.getEventLogger(); + } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java index be9f8d5188..838cb80103 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java @@ -39,7 +39,6 @@ import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListen import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.LogRecorder; -import org.apache.qpid.server.logging.MessageLogger; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; @@ -62,7 +61,6 @@ public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker> private final StatisticsGatherer _statisticsGatherer; private final VirtualHostRegistry _virtualHostRegistry; private final LogRecorder _logRecorder; - private final EventLogger _eventLogger; private final AuthenticationProviderFactory _authenticationProviderFactory; private final AccessControlProviderFactory _accessControlProviderFactory; private final PortFactory _portFactory; @@ -71,10 +69,16 @@ public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker> private final GroupProviderFactory _groupProviderFactory; private final StoreConfigurationChangeListener _storeChangeListener; - public BrokerRecoverer(AuthenticationProviderFactory authenticationProviderFactory, GroupProviderFactory groupProviderFactory, - AccessControlProviderFactory accessControlProviderFactory, PortFactory portFactory, StatisticsGatherer statisticsGatherer, - VirtualHostRegistry virtualHostRegistry, LogRecorder logRecorder, EventLogger eventLogger, TaskExecutor taskExecutor, - BrokerOptions brokerOptions, StoreConfigurationChangeListener storeChangeListener) + public BrokerRecoverer(AuthenticationProviderFactory authenticationProviderFactory, + GroupProviderFactory groupProviderFactory, + AccessControlProviderFactory accessControlProviderFactory, + PortFactory portFactory, + StatisticsGatherer statisticsGatherer, + VirtualHostRegistry virtualHostRegistry, + LogRecorder logRecorder, + TaskExecutor taskExecutor, + BrokerOptions brokerOptions, + StoreConfigurationChangeListener storeChangeListener) { _groupProviderFactory = groupProviderFactory; _portFactory = portFactory; @@ -83,14 +87,13 @@ public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker> _statisticsGatherer = statisticsGatherer; _virtualHostRegistry = virtualHostRegistry; _logRecorder = logRecorder; - _eventLogger = eventLogger; _taskExecutor = taskExecutor; _brokerOptions = brokerOptions; _storeChangeListener = storeChangeListener; } @Override - public Broker create(RecovererProvider recovererProvider, ConfigurationEntry entry, ConfiguredObject... parents) + public BrokerAdapter create(RecovererProvider recovererProvider, ConfigurationEntry entry, ConfiguredObject... parents) { Map<String, Object> attributesCopy = validateAttributes(entry); @@ -98,7 +101,7 @@ public class BrokerRecoverer implements ConfiguredObjectRecoverer<Broker> BrokerAdapter broker = new BrokerAdapter(entry.getId(), attributesCopy, _statisticsGatherer, _virtualHostRegistry, _logRecorder, - _eventLogger, _authenticationProviderFactory,_groupProviderFactory, _accessControlProviderFactory, + _authenticationProviderFactory,_groupProviderFactory, _accessControlProviderFactory, _portFactory, _taskExecutor, entry.getStore(), _brokerOptions); broker.addChangeListener(_storeChangeListener); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java index 1c64c38156..da47f0c916 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java @@ -25,7 +25,6 @@ import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer; import org.apache.qpid.server.configuration.RecovererProvider; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.LogRecorder; -import org.apache.qpid.server.logging.MessageLogger; import org.apache.qpid.server.model.AccessControlProvider; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; @@ -56,7 +55,6 @@ public class DefaultRecovererProvider implements RecovererProvider private final StatisticsGatherer _brokerStatisticsGatherer; private final VirtualHostRegistry _virtualHostRegistry; private final LogRecorder _logRecorder; - private final EventLogger _eventLogger; private final AuthenticationProviderFactory _authenticationProviderFactory; private final AccessControlProviderFactory _accessControlProviderFactory; private final PortFactory _portFactory; @@ -66,8 +64,12 @@ public class DefaultRecovererProvider implements RecovererProvider private final BrokerOptions _brokerOptions; private final StoreConfigurationChangeListener _storeChangeListener; - public DefaultRecovererProvider(StatisticsGatherer brokerStatisticsGatherer, VirtualHostRegistry virtualHostRegistry, - LogRecorder logRecorder, EventLogger eventLogger, TaskExecutor taskExecutor, BrokerOptions brokerOptions, StoreConfigurationChangeListener storeChangeListener) + public DefaultRecovererProvider(StatisticsGatherer brokerStatisticsGatherer, + VirtualHostRegistry virtualHostRegistry, + LogRecorder logRecorder, + TaskExecutor taskExecutor, + BrokerOptions brokerOptions, + StoreConfigurationChangeListener storeChangeListener) { _authenticationProviderFactory = new AuthenticationProviderFactory(new QpidServiceLoader<AuthenticationManagerFactory>()); _accessControlProviderFactory = new AccessControlProviderFactory(new QpidServiceLoader<AccessControlFactory>()); @@ -76,7 +78,6 @@ public class DefaultRecovererProvider implements RecovererProvider _brokerStatisticsGatherer = brokerStatisticsGatherer; _virtualHostRegistry = virtualHostRegistry; _logRecorder = logRecorder; - _eventLogger = eventLogger; _pluginFactoryServiceLoader = new QpidServiceLoader<PluginFactory>(); _taskExecutor = taskExecutor; _brokerOptions = brokerOptions; @@ -90,7 +91,7 @@ public class DefaultRecovererProvider implements RecovererProvider { return new BrokerRecoverer(_authenticationProviderFactory, _groupProviderFactory, _accessControlProviderFactory, _portFactory, _brokerStatisticsGatherer, _virtualHostRegistry, _logRecorder, - _eventLogger, _taskExecutor, _brokerOptions, _storeChangeListener); + _taskExecutor, _brokerOptions, _storeChangeListener); } else if(VirtualHost.class.getSimpleName().equals(type)) { 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 30e15f4c45..1fa86cf33c 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 @@ -104,8 +104,6 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>> private StateChangeListener<BindingImpl, State> _bindingListener; - private final EventLogger _eventLogger; - public AbstractExchange(VirtualHost vhost, Map<String, Object> attributes) throws UnknownExchangeException { super(MapValueConverter.getUUIDAttribute(org.apache.qpid.server.model.Exchange.ID, attributes), @@ -119,7 +117,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>> LifetimePolicy.PERMANENT); _autoDelete = _lifetimePolicy != LifetimePolicy.PERMANENT; _logSubject = new ExchangeLogSubject(this, this.getVirtualHost()); - _eventLogger = vhost.getEventLogger(); + // check ACL _virtualHost.getSecurityManager().authoriseCreateExchange(this); @@ -175,7 +173,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>> @Override public EventLogger getEventLogger() { - return _eventLogger; + return _virtualHost.getEventLogger(); } public abstract ExchangeType<T> getExchangeType(); @@ -213,7 +211,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>> _alternateExchange.removeReference(this); } - _eventLogger.message(_logSubject, ExchangeMessages.DELETED()); + getEventLogger().message(_logSubject, ExchangeMessages.DELETED()); for(Action<ExchangeImpl> task : _closeTaskList) { 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 dd6e70692d..ab07b3eec6 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 @@ -243,4 +243,6 @@ public interface Broker<X extends Broker<X>> extends ConfiguredObject<X> AuthenticationProvider<?> getAuthenticationProvider(SocketAddress localAddress); EventLogger getEventLogger(); + + void setEventLogger(EventLogger eventLogger); } 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 05d907e03d..02e37d6733 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 @@ -145,7 +145,7 @@ public class BrokerAdapter<X extends Broker<X>> extends AbstractConfiguredObject VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN}; - private final EventLogger _eventLogger; + private EventLogger _eventLogger; private final StatisticsGatherer _statisticsGatherer; private final VirtualHostRegistry _virtualHostRegistry; private final LogRecorder _logRecorder; @@ -173,16 +173,24 @@ public class BrokerAdapter<X extends Broker<X>> extends AbstractConfiguredObject private AuthenticationProvider<?> _managementAuthenticationProvider; private BrokerOptions _brokerOptions; - public BrokerAdapter(UUID id, Map<String, Object> attributes, StatisticsGatherer statisticsGatherer, VirtualHostRegistry virtualHostRegistry, - LogRecorder logRecorder, EventLogger eventLogger, AuthenticationProviderFactory authenticationProviderFactory, - GroupProviderFactory groupProviderFactory, AccessControlProviderFactory accessControlProviderFactory, PortFactory portFactory, - TaskExecutor taskExecutor, ConfigurationEntryStore brokerStore, BrokerOptions brokerOptions) + public BrokerAdapter(UUID id, + Map<String, Object> attributes, + StatisticsGatherer statisticsGatherer, + VirtualHostRegistry virtualHostRegistry, + LogRecorder logRecorder, + AuthenticationProviderFactory authenticationProviderFactory, + GroupProviderFactory groupProviderFactory, + AccessControlProviderFactory accessControlProviderFactory, + PortFactory portFactory, + TaskExecutor taskExecutor, + ConfigurationEntryStore brokerStore, + BrokerOptions brokerOptions) { super(id, DEFAULTS, MapValueConverter.convert(attributes, ATTRIBUTE_TYPES), taskExecutor); _statisticsGatherer = statisticsGatherer; _virtualHostRegistry = virtualHostRegistry; _logRecorder = logRecorder; - _eventLogger = eventLogger; + _eventLogger = virtualHostRegistry.getEventLogger(); _authenticationProviderFactory = authenticationProviderFactory; _groupProviderFactory = groupProviderFactory; _accessControlProviderFactory = accessControlProviderFactory; @@ -1433,4 +1441,10 @@ public class BrokerAdapter<X extends Broker<X>> extends AbstractConfiguredObject { return _eventLogger; } + + @Override + public void setEventLogger(final EventLogger eventLogger) + { + _eventLogger = eventLogger; + } } 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 181568ea5d..63dfdeb4b8 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 @@ -56,7 +56,6 @@ import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.consumer.Consumer; import org.apache.qpid.server.consumer.ConsumerTarget; -import org.apache.qpid.server.security.*; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.security.auth.AuthenticatedPrincipal; import org.apache.qpid.server.store.DurableConfigurationStoreHelper; @@ -100,7 +99,6 @@ public abstract class AbstractQueue }; private final VirtualHost _virtualHost; - private final EventLogger _eventLogger; /** null means shared */ private String _description; @@ -208,7 +206,7 @@ public abstract class AbstractQueue { super(MapValueConverter.getUUIDAttribute(Queue.ID, attributes), Collections.<String,Object>emptyMap(), attributes, virtualHost.getTaskExecutor()); - _eventLogger = virtualHost.getEventLogger(); + if (virtualHost == null) { throw new IllegalArgumentException("Virtual Host must not be null"); @@ -412,14 +410,14 @@ public abstract class AbstractQueue // Log the creation of this Queue. // The priorities display is toggled on if we set priorities > 0 - _eventLogger.message(_logSubject, - QueueMessages.CREATED(ownerString, - _entries.getPriorities(), - ownerString != null, - _lifetimePolicy != LifetimePolicy.PERMANENT, - durable, - !durable, - _entries.getPriorities() > 0)); + getEventLogger().message(_logSubject, + QueueMessages.CREATED(ownerString, + _entries.getPriorities(), + ownerString != null, + _lifetimePolicy != LifetimePolicy.PERMANENT, + durable, + !durable, + _entries.getPriorities() > 0)); if(attributes != null && attributes.containsKey(Queue.MESSAGE_GROUP_KEY)) { @@ -995,7 +993,7 @@ public abstract class AbstractQueue if(action != null || (exclusiveSub == null && _queueRunner.isIdle())) { /* - * iterate over consumers and if any is at the end of the queue and can deliver this message, + * iterate over consumers and if any is at the end of the queue and can deliver this message, * then deliver the message */ @@ -1438,7 +1436,7 @@ public abstract class AbstractQueue public EventLogger getEventLogger() { - return _eventLogger; + return _virtualHost.getEventLogger(); } @@ -1702,7 +1700,7 @@ public abstract class AbstractQueue stop(); //Log Queue Deletion - _eventLogger.message(_logSubject, QueueMessages.DELETED()); + getEventLogger().message(_logSubject, QueueMessages.DELETED()); } return getQueueDepthMessages(); @@ -1725,7 +1723,7 @@ public abstract class AbstractQueue { _overfull.set(true); //Overfull log message - _eventLogger.message(_logSubject, QueueMessages.OVERFULL(_atomicQueueSize.get(), _capacity)); + getEventLogger().message(_logSubject, QueueMessages.OVERFULL(_atomicQueueSize.get(), _capacity)); _blockedChannels.add(channel); @@ -1735,7 +1733,8 @@ public abstract class AbstractQueue { //Underfull log message - _eventLogger.message(_logSubject, QueueMessages.UNDERFULL(_atomicQueueSize.get(), _flowResumeCapacity)); + getEventLogger().message(_logSubject, + QueueMessages.UNDERFULL(_atomicQueueSize.get(), _flowResumeCapacity)); channel.unblock(this); _blockedChannels.remove(channel); @@ -1756,7 +1755,8 @@ public abstract class AbstractQueue { if(_overfull.compareAndSet(true,false)) {//Underfull log message - _eventLogger.message(_logSubject, QueueMessages.UNDERFULL(_atomicQueueSize.get(), _flowResumeCapacity)); + getEventLogger().message(_logSubject, + QueueMessages.UNDERFULL(_atomicQueueSize.get(), _flowResumeCapacity)); } for(final AMQSessionModel blockedChannel : _blockedChannels) 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 645262e227..fd9159334f 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 @@ -84,7 +84,6 @@ class QueueConsumerImpl STATE_MAP.put(ConsumerTarget.State.CLOSED, State.DELETED); } - private final EventLogger _eventLogger; private final ConsumerTarget _target; private final SubFlushRunner _runner = new SubFlushRunner(this); private volatile QueueContext _queueContext; @@ -92,7 +91,7 @@ class QueueConsumerImpl { public void stateChanged(QueueConsumerImpl sub, State oldState, State newState) { - _eventLogger.message(QueueConsumerImpl.this, SubscriptionMessages.STATE(newState.toString())); + getEventLogger().message(QueueConsumerImpl.this, SubscriptionMessages.STATE(newState.toString())); } }; @ManagedAttributeField @@ -126,7 +125,6 @@ class QueueConsumerImpl _isTransient = optionSet.contains(Option.TRANSIENT); _target = target; _queue = queue; - _eventLogger = queue.getEventLogger(); setupLogging(); // Access control @@ -180,12 +178,12 @@ class QueueConsumerImpl { if(_targetClosed.compareAndSet(false,true)) { - _eventLogger.message(getLogSubject(), SubscriptionMessages.CLOSE()); + getEventLogger().message(getLogSubject(), SubscriptionMessages.CLOSE()); } } else { - _eventLogger.message(getLogSubject(), SubscriptionMessages.STATE(newState.toString())); + getEventLogger().message(getLogSubject(), SubscriptionMessages.STATE(newState.toString())); } } @@ -299,9 +297,9 @@ class QueueConsumerImpl private void setupLogging() { final String filterLogString = getFilterLogString(); - _eventLogger.message(this, - SubscriptionMessages.CREATE(filterLogString, _queue.isDurable() && _exclusive, - filterLogString.length() > 0)); + getEventLogger().message(this, + SubscriptionMessages.CREATE(filterLogString, _queue.isDurable() && _exclusive, + filterLogString.length() > 0)); } protected final LogSubject getLogSubject() @@ -589,4 +587,9 @@ class QueueConsumerImpl return logString; } + + private EventLogger getEventLogger() + { + return _queue.getEventLogger(); + } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java index 6add2cef21..764c92d53d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.registry; import java.security.PrivilegedAction; import java.util.Collection; -import java.util.Collections; import java.util.Timer; import java.util.TimerTask; @@ -44,7 +43,6 @@ import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.State; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.security.SecurityManager; -import org.apache.qpid.server.security.auth.TaskPrincipal; import org.apache.qpid.server.stats.StatisticsCounter; import org.apache.qpid.server.stats.StatisticsGatherer; import org.apache.qpid.server.virtualhost.VirtualHost; @@ -84,7 +82,7 @@ public class ApplicationRegistry implements IApplicationRegistry { _store = store; _eventLogger = eventLogger; - _virtualHostRegistry = new VirtualHostRegistry(eventLogger); + _virtualHostRegistry = new VirtualHostRegistry(_eventLogger); initialiseStatistics(); } @@ -93,25 +91,27 @@ public class ApplicationRegistry implements IApplicationRegistry // Create the RootLogger to be used during broker operation boolean statusUpdatesEnabled = Boolean.parseBoolean(System.getProperty(BrokerProperties.PROPERTY_STATUS_UPDATES, "true")); _messageLogger = new Log4jMessageLogger(statusUpdatesEnabled); - + _eventLogger.setMessageLogger(_messageLogger); _logRecorder = new LogRecorder(); //Create the composite (log4j+SystemOut MessageLogger to be used during startup MessageLogger[] messageLoggers = {new SystemOutMessageLogger(), _messageLogger}; + CompositeStartupMessageLogger startupMessageLogger = new CompositeStartupMessageLogger(messageLoggers); - _eventLogger.setMessageLogger(startupMessageLogger); + EventLogger startupLogger = new EventLogger(startupMessageLogger); - logStartupMessages(); + + logStartupMessages(startupLogger); _taskExecutor = new TaskExecutor(); _taskExecutor.start(); StoreConfigurationChangeListener storeChangeListener = new StoreConfigurationChangeListener(_store); RecovererProvider provider = new DefaultRecovererProvider((StatisticsGatherer)this, _virtualHostRegistry, _logRecorder, - _eventLogger, _taskExecutor, brokerOptions, storeChangeListener); + _taskExecutor, brokerOptions, storeChangeListener); ConfiguredObjectRecoverer<? extends ConfiguredObject> brokerRecoverer = provider.getRecoverer(Broker.class.getSimpleName()); _broker = (Broker) brokerRecoverer.create(provider, _store.getRootEntry()); - + _broker.setEventLogger(startupLogger); _virtualHostRegistry.setDefaultVirtualHostName((String)_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST)); initialiseStatisticsReporting(); @@ -119,8 +119,8 @@ public class ApplicationRegistry implements IApplicationRegistry // starting the broker _broker.setDesiredState(State.INITIALISING, State.ACTIVE); - _eventLogger.message(BrokerMessages.READY()); - _eventLogger.setMessageLogger(_messageLogger); + startupLogger.message(BrokerMessages.READY()); + _broker.setEventLogger(_eventLogger); } @@ -324,17 +324,17 @@ public class ApplicationRegistry implements IApplicationRegistry _dataReceived = new StatisticsCounter("bytes-received"); } - private void logStartupMessages() + private void logStartupMessages(EventLogger eventLogger) { - _eventLogger.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(), QpidProperties.getBuildVersion())); + eventLogger.message(BrokerMessages.STARTUP(QpidProperties.getReleaseVersion(), QpidProperties.getBuildVersion())); - _eventLogger.message(BrokerMessages.PLATFORM(System.getProperty("java.vendor"), + eventLogger.message(BrokerMessages.PLATFORM(System.getProperty("java.vendor"), System.getProperty("java.runtime.version", System.getProperty("java.version")), SystemUtils.getOSName(), SystemUtils.getOSVersion(), SystemUtils.getOSArch())); - _eventLogger.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory())); + eventLogger.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory())); } @Override diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java index 0c7a5fa586..cec5dc281a 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java @@ -38,9 +38,7 @@ import org.apache.qpid.server.configuration.ConfigurationEntry; import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.RecovererProvider; -import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.LogRecorder; -import org.apache.qpid.server.logging.MessageLogger; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; @@ -78,7 +76,8 @@ public class BrokerRecovererTest extends TestCase super.setUp(); _brokerRecoverer = new BrokerRecoverer(mock(AuthenticationProviderFactory.class), mock(GroupProviderFactory.class), mock(AccessControlProviderFactory.class), mock(PortFactory.class), - mock(StatisticsGatherer.class), mock(VirtualHostRegistry.class), mock(LogRecorder.class), new EventLogger(), mock(TaskExecutor.class), mock(BrokerOptions.class), + mock(StatisticsGatherer.class), mock(VirtualHostRegistry.class), mock(LogRecorder.class), + mock(TaskExecutor.class), mock(BrokerOptions.class), mock(StoreConfigurationChangeListener.class)); when(_brokerEntry.getId()).thenReturn(_brokerId); when(_brokerEntry.getChildren()).thenReturn(_brokerEntryChildren); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java index abb66d9196..57acea7351 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java @@ -25,9 +25,7 @@ import junit.framework.TestCase; import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer; -import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.LogRecorder; -import org.apache.qpid.server.logging.MessageLogger; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.GroupProvider; @@ -58,7 +56,7 @@ public class DefaultRecovererProviderTest extends TestCase TaskExecutor taskExecutor = mock(TaskExecutor.class); DefaultRecovererProvider provider = new DefaultRecovererProvider(statisticsGatherer, virtualHostRegistry, - logRecorder, new EventLogger(), taskExecutor, mock(BrokerOptions.class), + logRecorder, taskExecutor, mock(BrokerOptions.class), mock(StoreConfigurationChangeListener.class)); for (String configuredObjectType : supportedTypes) { diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java index a7dff974e7..a6d4f57996 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java @@ -63,7 +63,7 @@ public class ConfiguredObjectStateTransitionTest extends QpidTestCase when(_broker.getTaskExecutor()).thenReturn(executor); _recovererProvider = new DefaultRecovererProvider(statisticsGatherer, _broker.getVirtualHostRegistry(), - _broker.getLogRecorder(), _broker.getEventLogger(), executor, new BrokerOptions(), mock(StoreConfigurationChangeListener.class)); + _broker.getLogRecorder(), executor, new BrokerOptions(), mock(StoreConfigurationChangeListener.class)); _store = mock(ConfigurationEntryStore.class); |