Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RecordEventAppender.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RecordEventAppender.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RecordEventAppender.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import java.util.concurrent.atomic.AtomicLong;
Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/StartupAppender.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/StartupAppender.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/StartupAppender.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import java.util.ArrayList; import java.util.List; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java Mon Aug 1 16:11:33 2016 @@ -18,12 +18,13 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import java.util.List; import java.util.Set; +import org.apache.qpid.server.logging.LogFileDetails; import org.apache.qpid.server.model.DerivedAttribute; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedObject; @@ -32,7 +33,7 @@ import org.apache.qpid.server.model.Para import org.apache.qpid.server.model.Content; import org.apache.qpid.server.model.VirtualHostLogger; -@ManagedObject( category = false, type = VirtualHostFileLogger.TYPE) +@ManagedObject( category = false, type = VirtualHostFileLogger.TYPE, validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()") public interface VirtualHostFileLogger<X extends VirtualHostFileLogger<X>> extends VirtualHostLogger<X> { String TYPE = "File"; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import java.io.File; import java.util.Collections; @@ -33,18 +33,17 @@ import ch.qos.logback.core.Appender; import ch.qos.logback.core.Context; import ch.qos.logback.core.rolling.RollingFileAppender; -import org.apache.qpid.server.logging.logback.RollingPolicyDecorator; -import org.apache.qpid.server.logging.logback.RolloverWatcher; +import org.apache.qpid.server.logging.LogFileDetails; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.Content; import org.apache.qpid.server.model.Param; import org.apache.qpid.server.model.VirtualHost; -import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.util.DaemonThreadFactory; -public class VirtualHostFileLoggerImpl extends AbstractVirtualHostLogger<VirtualHostFileLoggerImpl> implements VirtualHostFileLogger<VirtualHostFileLoggerImpl>, FileLoggerSettings +public class VirtualHostFileLoggerImpl extends AbstractVirtualHostLogger<VirtualHostFileLoggerImpl> + implements VirtualHostFileLogger<VirtualHostFileLoggerImpl>, FileLoggerSettings { private volatile RolloverWatcher _rolloverWatcher; private ScheduledExecutorService _rolledPolicyExecutor; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilter.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilter.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilter.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import java.security.AccessController; import java.security.Principal; @@ -29,10 +29,12 @@ import javax.security.auth.Subject; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; + +import org.apache.qpid.server.logging.LogInclusionRule; import org.apache.qpid.server.model.BrokerLogger; import org.apache.qpid.server.virtualhost.VirtualHostPrincipal; -public class VirtualHostLogEventExcludingFilter extends Filter<ILoggingEvent> implements LogInclusionRule +public class VirtualHostLogEventExcludingFilter extends Filter<ILoggingEvent> implements LogBackLogInclusionRule { private final BrokerLogger<?> _brokerLogger ; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRule.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRule.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRule.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java Mon Aug 1 16:11:33 2016 @@ -18,14 +18,15 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; +import org.apache.qpid.server.logging.LogLevel; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.VirtualHostLogInclusionRule; @ManagedObject( category = false, type = VirtualHostNameAndLevelLogInclusionRule.TYPE) -public interface VirtualHostNameAndLevelLogInclusionRule<X extends VirtualHostNameAndLevelLogInclusionRule<X>> extends VirtualHostLogInclusionRule<X> +public interface VirtualHostNameAndLevelLogInclusionRule<X extends VirtualHostNameAndLevelLogInclusionRule<X>> extends VirtualHostLogInclusionRule<X>, LogBackLogInclusionRule { String TYPE = "NameAndLevel"; String LOGGER_NAME = "loggerName"; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImpl.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import java.util.Map; import java.util.Set; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLogger.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLogger.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java Mon Aug 1 16:11:33 2016 @@ -18,13 +18,14 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.VirtualHostLogger; -@ManagedObject( category = false, type = VirtualHostSyslogLogger.TYPE) +@ManagedObject( category = false, type = VirtualHostSyslogLogger.TYPE, + validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()") public interface VirtualHostSyslogLogger<X extends VirtualHostSyslogLogger<X>> extends VirtualHostLogger<X> { String TYPE = "Syslog"; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLoggerImpl.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLoggerImpl.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLoggerImpl.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLoggerImpl.java Mon Aug 1 16:11:33 2016 @@ -18,19 +18,21 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import ch.qos.logback.classic.net.SyslogAppender; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.Context; + import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHost; import java.util.Map; -public class VirtualHostSyslogLoggerImpl extends AbstractVirtualHostLogger<VirtualHostSyslogLoggerImpl> implements VirtualHostSyslogLogger<VirtualHostSyslogLoggerImpl> +public class VirtualHostSyslogLoggerImpl extends AbstractVirtualHostLogger<VirtualHostSyslogLoggerImpl> + implements VirtualHostSyslogLogger<VirtualHostSyslogLoggerImpl> { @ManagedAttributeField private String _syslogHost; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,6 +38,8 @@ import ch.qos.logback.core.rolling.TimeB import ch.qos.logback.core.rolling.TriggeringPolicy; import ch.qos.logback.core.rolling.helper.CompressionMode; import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.logback.AppenderUtils; +import org.apache.qpid.server.logging.logback.FileLoggerSettings; import org.apache.qpid.server.logging.logback.RollingPolicyDecorator; import org.apache.qpid.test.utils.QpidTestCase; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerStatusListenerTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerStatusListenerTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerStatusListenerTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java Mon Aug 1 16:11:33 2016 @@ -19,7 +19,7 @@ * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -30,6 +30,10 @@ import java.io.IOError; import java.io.IOException; import ch.qos.logback.core.status.Status; + +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.logback.BrokerFileLogger; +import org.apache.qpid.server.logging.logback.BrokerFileLoggerImpl; import org.apache.qpid.server.model.SystemConfig; import org.apache.qpid.test.utils.QpidTestCase; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -31,6 +31,10 @@ import java.util.Map; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.LogFileDetails; +import org.apache.qpid.server.logging.logback.BrokerFileLogger; +import org.apache.qpid.server.logging.logback.BrokerFileLoggerImpl; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerLogger; import org.apache.qpid.server.model.BrokerModel; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.apache.qpid.server.util.LoggerTestHelper.assertLoggedEvent; import static org.mockito.Mockito.doReturn; @@ -39,6 +39,11 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; +import org.apache.qpid.server.logging.LogLevel; +import org.apache.qpid.server.logging.logback.AbstractBrokerLogger; +import org.apache.qpid.server.logging.logback.BrokerMemoryLogger; +import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule; +import org.apache.qpid.server.logging.logback.LogRecord; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerLogInclusionRule; import org.apache.qpid.server.model.BrokerModel; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerMemoryLoggerTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerMemoryLoggerTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerMemoryLoggerTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -33,12 +33,13 @@ import org.apache.qpid.server.BrokerOpti import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutor; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.logback.BrokerMemoryLogger; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerLogger; import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.JsonSystemConfigImpl; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.SystemConfig; import org.apache.qpid.server.store.ConfiguredObjectRecord; import org.apache.qpid.server.store.GenericRecoverer; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -34,6 +34,10 @@ import ch.qos.logback.core.filter.Filter import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; +import org.apache.qpid.server.logging.LogLevel; +import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule; +import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRuleImpl; +import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerLogger; import org.apache.qpid.server.model.BrokerModel; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/CompositeFilterTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/CompositeFilterTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/CompositeFilterTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -31,6 +31,9 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; + +import org.apache.qpid.server.logging.LogInclusionRule; +import org.apache.qpid.server.logging.logback.CompositeFilter; import org.apache.qpid.test.utils.QpidTestCase; public class CompositeFilterTest extends QpidTestCase @@ -70,13 +73,13 @@ public class CompositeFilterTest extends { CompositeFilter compositeFilter = new CompositeFilter(); - LogInclusionRule neutral = createRule(FilterReply.NEUTRAL); + LogBackLogInclusionRule neutral = createRule(FilterReply.NEUTRAL); compositeFilter.addLogInclusionRule(neutral); - LogInclusionRule deny = createRule(FilterReply.DENY); + LogBackLogInclusionRule deny = createRule(FilterReply.DENY); compositeFilter.addLogInclusionRule(deny); - LogInclusionRule accept = createRule(FilterReply.ACCEPT); + LogBackLogInclusionRule accept = createRule(FilterReply.ACCEPT); compositeFilter.addLogInclusionRule(accept); FilterReply reply = compositeFilter.decide(mock(ILoggingEvent.class)); @@ -91,13 +94,13 @@ public class CompositeFilterTest extends { CompositeFilter compositeFilter = new CompositeFilter(); - LogInclusionRule neutral = createRule(FilterReply.NEUTRAL, "neutral"); + LogBackLogInclusionRule neutral = createRule(FilterReply.NEUTRAL, "neutral"); compositeFilter.addLogInclusionRule(neutral); - LogInclusionRule deny = createRule(FilterReply.DENY, "deny"); + LogBackLogInclusionRule deny = createRule(FilterReply.DENY, "deny"); compositeFilter.addLogInclusionRule(deny); - LogInclusionRule accept = createRule(FilterReply.ACCEPT, "accept"); + LogBackLogInclusionRule accept = createRule(FilterReply.ACCEPT, "accept"); compositeFilter.addLogInclusionRule(accept); FilterReply reply = compositeFilter.decide(mock(ILoggingEvent.class)); @@ -119,20 +122,20 @@ public class CompositeFilterTest extends { CompositeFilter compositeFilter = new CompositeFilter(); - LogInclusionRule rule = createRule(FilterReply.ACCEPT, "accept"); + LogBackLogInclusionRule rule = createRule(FilterReply.ACCEPT, "accept"); compositeFilter.addLogInclusionRule(rule); verify(rule.asFilter()).setName("accept"); } - private LogInclusionRule createRule(FilterReply decision) + private LogBackLogInclusionRule createRule(FilterReply decision) { return createRule(decision, "UNNAMED"); } - private LogInclusionRule createRule(final FilterReply decision, String name) + private LogBackLogInclusionRule createRule(final FilterReply decision, String name) { - LogInclusionRule rule = mock(LogInclusionRule.class); + LogBackLogInclusionRule rule = mock(LogBackLogInclusionRule.class); when(rule.getName()).thenReturn(name); Filter filter = mock(Filter.class); when(filter.getName()).thenReturn(name); Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilterTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilterTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilterTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -27,6 +27,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.FilterReply; + +import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter; import org.apache.qpid.test.utils.QpidTestCase; public class LoggerNameAndLevelFilterTest extends QpidTestCase Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/PrincipalLogEventFilterTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/PrincipalLogEventFilterTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/PrincipalLogEventFilterTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; @@ -30,6 +30,7 @@ import javax.security.auth.Subject; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.FilterReply; +import org.apache.qpid.server.logging.logback.PrincipalLogEventFilter; import org.apache.qpid.test.utils.QpidTestCase; public class PrincipalLogEventFilterTest extends QpidTestCase @@ -92,4 +93,4 @@ public class PrincipalLogEventFilterTest } }); } -} \ No newline at end of file +} Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java Mon Aug 1 16:11:33 2016 @@ -18,12 +18,14 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.Logger; +import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter; +import org.apache.qpid.server.logging.logback.QpidLoggerTurboFilter; import org.apache.qpid.test.utils.QpidTestCase; public class QpidLoggerTurboFilterTest extends QpidTestCase Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/StartupAppenderTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/StartupAppenderTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/StartupAppenderTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; @@ -39,6 +39,7 @@ import ch.qos.logback.classic.spi.ILoggi import ch.qos.logback.core.Appender; import ch.qos.logback.core.Context; import org.apache.qpid.server.configuration.BrokerProperties; +import org.apache.qpid.server.logging.logback.StartupAppender; import org.apache.qpid.test.utils.QpidTestCase; public class StartupAppenderTest extends QpidTestCase Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilterTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilterTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilterTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -31,6 +31,8 @@ import javax.security.auth.Subject; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.spi.FilterReply; + +import org.apache.qpid.server.logging.logback.VirtualHostLogEventExcludingFilter; import org.apache.qpid.server.model.BrokerLogger; import org.apache.qpid.server.virtualhost.VirtualHostPrincipal; import org.apache.qpid.test.utils.QpidTestCase; @@ -113,4 +115,4 @@ public class VirtualHostLogEventExcludin } }); } -} \ No newline at end of file +} Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -34,6 +34,10 @@ import java.util.Map; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.LogFileDetails; +import org.apache.qpid.server.logging.logback.VirtualHostFileLogger; +import org.apache.qpid.server.logging.logback.VirtualHostFileLoggerImpl; import org.apache.qpid.server.model.BrokerTestHelper; import org.apache.qpid.server.security.AccessControl; import org.apache.qpid.server.store.DurableConfigurationStore; Copied: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java (from r1754770, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java Mon Aug 1 16:11:33 2016 @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.qpid.server.logging; +package org.apache.qpid.server.logging.logback; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -35,6 +35,11 @@ import ch.qos.logback.core.filter.Filter import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; +import org.apache.qpid.server.logging.LogLevel; +import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule; +import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter; +import org.apache.qpid.server.logging.logback.VirtualHostNameAndLevelLogInclusionRule; +import org.apache.qpid.server.logging.logback.VirtualHostNameAndLevelLogInclusionRuleImpl; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.Model; @@ -150,7 +155,7 @@ public class VirtualHostNameAndLevelLogI attributes.put("name", "test"); VirtualHostNameAndLevelLogInclusionRuleImpl rule = new VirtualHostNameAndLevelLogInclusionRuleImpl(attributes, - _virtualHostLogger); + _virtualHostLogger); rule.open(); return rule; } Modified: qpid/java/trunk/broker/pom.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/pom.xml?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker/pom.xml (original) +++ qpid/java/trunk/broker/pom.xml Mon Aug 1 16:11:33 2016 @@ -52,6 +52,12 @@ </dependency> <dependency> + <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-plugins-logging-logback</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>${commons-cli-version}</version> Copied: qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Broker.java (from r1754770, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java) URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Broker.java?p2=qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Broker.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java&r1=1754770&r2=1754771&rev=1754771&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java (original) +++ qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Broker.java Mon Aug 1 16:11:33 2016 @@ -47,8 +47,9 @@ import org.apache.qpid.server.configurat import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.LoggingMessageLogger; import org.apache.qpid.server.logging.MessageLogger; -import org.apache.qpid.server.logging.StartupAppender; import org.apache.qpid.server.logging.SystemOutMessageLogger; +import org.apache.qpid.server.logging.logback.QpidLoggerTurboFilter; +import org.apache.qpid.server.logging.logback.StartupAppender; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.SystemConfig; import org.apache.qpid.server.plugin.PluggableFactoryLoader; @@ -203,6 +204,38 @@ public class Broker _eventLogger, _systemPrincipal, options.convertToSystemConfigAttributes()); + + _systemConfig.setOnContainerResolveTask(new Runnable() { + + @Override + public void run() + { + + ch.qos.logback.classic.Logger rootLogger = + (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); + + StartupAppender startupAppender = (StartupAppender) rootLogger.getAppender(StartupAppender.class.getName()); + if (startupAppender != null) + { + rootLogger.detachAppender(startupAppender); + startupAppender.stop(); + } + + } + }); + _systemConfig.setOnContainerCloseTask(new Runnable() + { + + @Override + public void run() + { + + QpidLoggerTurboFilter.uninstallFromRootContext(); + + } + }); + + _systemConfig.open(); if (_systemConfig.getChild(org.apache.qpid.server.model.Broker.class).getState() == State.ERRORED) { Modified: qpid/java/trunk/pom.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/pom.xml (original) +++ qpid/java/trunk/pom.xml Mon Aug 1 16:11:33 2016 @@ -179,6 +179,7 @@ <module>broker-plugins/derby-store</module> <module>broker-plugins/jdbc-provider-bone</module> <module>broker-plugins/jdbc-store</module> + <module>broker-plugins/logging-logback</module> <module>broker-plugins/management-amqp</module> <module>broker-plugins/management-http</module> <module>broker-plugins/memory-store</module> Modified: qpid/java/trunk/systests/pom.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/pom.xml?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/systests/pom.xml (original) +++ qpid/java/trunk/systests/pom.xml Mon Aug 1 16:11:33 2016 @@ -147,6 +147,12 @@ <dependency> <groupId>org.apache.qpid</groupId> + <artifactId>qpid-broker-plugins-logging-logback</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.qpid</groupId> <artifactId>qpid-broker-plugins-management-http</artifactId> <version>${project.version}</version> </dependency> Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original) +++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Mon Aug 1 16:11:33 2016 @@ -37,8 +37,8 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.configuration.BrokerProperties; -import org.apache.qpid.server.logging.BrokerLogbackSocketLogger; -import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule; +import org.apache.qpid.server.logging.logback.BrokerLogbackSocketLogger; +import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule; import org.apache.qpid.server.logging.messages.BrokerMessages; import org.apache.qpid.server.model.BrokerLogInclusionRule; import org.apache.qpid.server.model.BrokerLogger; Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java Mon Aug 1 16:11:33 2016 @@ -28,9 +28,11 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.apache.qpid.server.logging.VirtualHostFileLogger; +import org.apache.qpid.server.logging.logback.VirtualHostFileLogger; +import org.apache.qpid.server.logging.logback.VirtualHostNameAndLevelLogInclusionRule; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Queue; +import org.apache.qpid.server.model.VirtualHostLogInclusionRule; import org.apache.qpid.server.model.VirtualHostLogger; import org.apache.qpid.util.LogMonitor; @@ -54,6 +56,7 @@ public class VirtualHostLoggerRestTest e Map<String, Object> virtualHostRuleAttributes = new HashMap<>(); virtualHostRuleAttributes.put("name", loggerRuleName); virtualHostRuleAttributes.put("level", "DEBUG"); + virtualHostRuleAttributes.put("type", VirtualHostNameAndLevelLogInclusionRule.TYPE); String loggerRuleRestUrlBase = "virtualhostloginclusionrule/" + TEST1_VIRTUALHOST + "/" + TEST1_VIRTUALHOST + "/" + loggerName; String loggerRuleRestUrl = loggerRuleRestUrlBase + "/" + loggerRuleName; Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Mon Aug 1 16:11:33 2016 @@ -28,9 +28,9 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.apache.qpid.server.logging.BrokerFileLogger; -import org.apache.qpid.server.logging.BrokerMemoryLogger; -import org.apache.qpid.server.logging.BrokerNameAndLevelLogInclusionRule; +import org.apache.qpid.server.logging.logback.BrokerFileLogger; +import org.apache.qpid.server.logging.logback.BrokerMemoryLogger; +import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule; import org.apache.qpid.server.management.plugin.HttpManagement; import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet; import org.apache.qpid.server.model.AccessControlProvider; Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java?rev=1754771&r1=1754770&r2=1754771&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java Mon Aug 1 16:11:33 2016 @@ -25,7 +25,7 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.apache.qpid.server.logging.VirtualHostFileLogger; +import org.apache.qpid.server.logging.logback.VirtualHostFileLogger; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.model.VirtualHostLogger; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
