svn commit: r1754771 [1/2] - in /qpid/java/trunk: ./ broker-core/ broker-core/src/main/java/org/apache/qpid/server/ broker-core/src/main/java/org/apache/qpid/server/logging/ broker-core/src/main/java/org/apache/qpid/server/logging/logback/ broker-core/...

[rgodfrey]

Author: rgodfrey
Date: Mon Aug  1 16:11:33 2016
New Revision: 1754771

URL: http://svn.apache.org/viewvc?rev=1754771&view=rev
Log:
QPID-7372 : Remove hard dependency on logback from broker-core

Added:
    qpid/java/trunk/broker-plugins/logging-logback/
    qpid/java/trunk/broker-plugins/logging-logback/pom.xml   (with props)
    qpid/java/trunk/broker-plugins/logging-logback/src/
    qpid/java/trunk/broker-plugins/logging-logback/src/main/
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/
      - copied from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/logback/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractBrokerLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractBrokerLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelLogInclusionRule.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractVirtualHostLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractVirtualHostLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLoggerImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRule.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRule.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLoggerImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/CompositeFilter.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeFilter.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/EffectiveLevelFilter.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/FileLoggerSettings.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/FileLoggerSettings.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java
   (with props)
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecord.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecord.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PrincipalLogEventFilter.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RecordEventAppender.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/StartupAppender.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilter.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRule.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImpl.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLogger.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLoggerImpl.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLoggerImpl.java
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/
    qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/
      - copied from r1754554, 
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/
      - copied from r1754770, 
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/logger/
      - copied from r1754554, 
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/
    qpid/java/trunk/broker-plugins/logging-logback/src/test/
    qpid/java/trunk/broker-plugins/logging-logback/src/test/java/
    qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/
    qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/
      - copied from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerStatusListenerTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerMemoryLoggerTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/CompositeFilterTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilterTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/PrincipalLogEventFilterTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/StartupAppenderTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilterTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java
    
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
    qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Broker.java
      - copied, changed from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
    qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/BrokerTest.java
      - copied unchanged from r1754770, 
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java
Removed:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractBrokerLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelLogInclusionRule.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractVirtualHostLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRule.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeFilter.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/FileLoggerSettings.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecord.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PrincipalLogEventFilter.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RecordEventAppender.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/StartupAppender.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilter.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRule.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLogger.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLoggerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/logback/
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerStatusListenerTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerMemoryLoggerTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/CompositeFilterTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilterTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/PrincipalLogEventFilterTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/StartupAppenderTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilterTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
    
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/logback/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/add.js
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/show.js
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/add.js
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/show.js
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/logger/brokerlogger/
    
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/resources/logger/virtualhostlogger/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/brokerlogbacksocket/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/console/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/file/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/memory/
    
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/logger/syslog/
Modified:
    qpid/java/trunk/broker-core/pom.xml
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogInclusionRule.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogInclusionRule.java
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
    qpid/java/trunk/broker/pom.xml
    qpid/java/trunk/pom.xml
    qpid/java/trunk/systests/pom.xml
    
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
    
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostLoggerRestTest.java
    
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
    
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java

Modified: qpid/java/trunk/broker-core/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/pom.xml?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/pom.xml (original)
+++ qpid/java/trunk/broker-core/pom.xml Mon Aug  1 16:11:33 2016
@@ -47,12 +47,6 @@
     </dependency>
 
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>${logback-version}</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j-version}</version>

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogInclusionRule.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogInclusionRule.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogInclusionRule.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogInclusionRule.java
 Mon Aug  1 16:11:33 2016
@@ -20,12 +20,7 @@
  */
 package org.apache.qpid.server.logging;
 
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.filter.Filter;
-
 public interface LogInclusionRule
 {
-    Filter<ILoggingEvent> asFilter();
-
     String getName();
 }

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
 Mon Aug  1 16:11:33 2016
@@ -80,6 +80,8 @@ public abstract class AbstractSystemConf
     private final EventLogger _eventLogger;
 
     private volatile DurableConfigurationStore _configurationStore;
+    private Runnable _onContainerResolveTask;
+    private Runnable _onContainerCloseTask;
 
     @ManagedAttributeField
     private boolean _managementMode;
@@ -472,6 +474,26 @@ public abstract class AbstractSystemConf
         return _systemPrincipal;
     }
 
+    public Runnable getOnContainerResolveTask()
+    {
+        return _onContainerResolveTask;
+    }
+
+    @Override
+    public void setOnContainerResolveTask(final Runnable 
onContainerResolveTask)
+    {
+        _onContainerResolveTask = onContainerResolveTask;
+    }
+
+    public Runnable getOnContainerCloseTask()
+    {
+        return _onContainerCloseTask;
+    }
+
+    public void setOnContainerCloseTask(final Runnable onContainerCloseTask)
+    {
+        _onContainerCloseTask = onContainerCloseTask;
+    }
 
     private class ShutdownService implements Runnable
     {

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
 Mon Aug  1 16:11:33 2016
@@ -168,7 +168,7 @@ public interface Broker<X extends Broker
     @ManagedContextDefault(name = BROKER_DIRECT_BYTE_BUFFER_POOL_SIZE)
     int DEFAULT_BROKER_DIRECT_BYTE_BUFFER_POOL_SIZE = 1024;
 
-    @ManagedAttribute(validValues = 
{"org.apache.qpid.server.model.adapter.BrokerImpl#getAvailableConfigurationEncrypters()"})
+    @ManagedAttribute(validValues = 
{"org.apache.qpid.server.model.BrokerImpl#getAvailableConfigurationEncrypters()"})
     String getConfidentialConfigurationEncryptionProvider();
 
     @DerivedAttribute( persist = true )

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
 Mon Aug  1 16:11:33 2016
@@ -20,19 +20,6 @@
  */
 package org.apache.qpid.server.model;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.management.BufferPoolMXBean;
-import java.lang.management.LockInfo;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MonitorInfo;
-import java.lang.management.PlatformManagedObject;
-import java.lang.management.RuntimeMXBean;
-import java.lang.management.ThreadInfo;
-import java.lang.management.ThreadMXBean;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.charset.Charset;
 import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.Principal;
@@ -44,16 +31,13 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.security.auth.Subject;
@@ -64,8 +48,6 @@ import org.apache.qpid.bytebuffer.QpidBy
 import org.apache.qpid.server.BrokerPrincipal;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
-import org.apache.qpid.server.logging.QpidLoggerTurboFilter;
-import org.apache.qpid.server.logging.StartupAppender;
 import org.apache.qpid.server.plugin.SystemAddressSpaceCreator;
 import org.apache.qpid.server.security.AccessControl;
 import org.apache.qpid.server.security.CompoundAccessControl;
@@ -79,7 +61,7 @@ import org.apache.qpid.server.store.pref
 import org.apache.qpid.server.store.preferences.PreferenceStoreUpdaterImpl;
 import org.apache.qpid.server.store.preferences.PreferencesRecoverer;
 import org.apache.qpid.server.util.HousekeepingExecutor;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,8 +71,6 @@ import org.apache.qpid.server.configurat
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.BrokerMessages;
 import org.apache.qpid.server.logging.messages.VirtualHostMessages;
-import org.apache.qpid.server.plugin.ConfigurationSecretEncrypterFactory;
-import org.apache.qpid.server.plugin.PluggableFactoryLoader;
 import org.apache.qpid.server.plugin.QpidServiceLoader;
 import org.apache.qpid.server.plugin.SystemNodeCreator;
 import 
org.apache.qpid.server.security.auth.manager.SimpleAuthenticationManager;
@@ -254,17 +234,13 @@ public class BrokerImpl extends Abstract
     {
         super.postResolveChildren();
 
-        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)
+        final SystemConfig parent = getParent(SystemConfig.class);
+        Runnable task =  parent.getOnContainerResolveTask();
+        if(task != null)
         {
-            rootLogger.detachAppender(startupAppender);
-            startupAppender.stop();
+            task.run();
         }
-
-        final SystemConfig parent = getParent(SystemConfig.class);
         addChangeListener(_accessControlProviderListener);
         _eventLogger.message(BrokerMessages.CONFIG(parent instanceof 
FileBasedSettings
                                                            ? 
((FileBasedSettings) parent).getStorePath()
@@ -732,8 +708,11 @@ public class BrokerImpl extends Abstract
         }
         finally
         {
-            // uninstall Qpid turbo filter
-            QpidLoggerTurboFilter.uninstallFromRootContext();
+            Runnable task = _parent.getOnContainerCloseTask();
+            if(task != null)
+            {
+                task.run();
+            }
         }
     }
 

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
 Mon Aug  1 16:11:33 2016
@@ -73,4 +73,12 @@ public interface SystemConfig<X extends
     <C extends ConfiguredObject<C>> C getChild(Class<C> childClass);
 
     DurableConfigurationStore getConfigurationStore();
+
+    Runnable getOnContainerResolveTask();
+
+    void setOnContainerResolveTask(Runnable runnable);
+
+    Runnable getOnContainerCloseTask();
+
+    void setOnContainerCloseTask(Runnable runnable);
 }

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogInclusionRule.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogInclusionRule.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogInclusionRule.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogInclusionRule.java
 Mon Aug  1 16:11:33 2016
@@ -21,9 +21,8 @@
 package org.apache.qpid.server.model;
 
 import org.apache.qpid.server.logging.LogInclusionRule;
-import org.apache.qpid.server.logging.VirtualHostNameAndLevelLogInclusionRule;
 
-@ManagedObject(defaultType = VirtualHostNameAndLevelLogInclusionRule.TYPE)
+@ManagedObject
 public interface VirtualHostLogInclusionRule<X extends 
VirtualHostLogInclusionRule<X>> extends ConfiguredObject<X>, LogInclusionRule
 {
 }

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java?rev=1754771&r1=1754770&r2=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
 Mon Aug  1 16:11:33 2016
@@ -20,9 +20,6 @@
  */
 package org.apache.qpid.server.security;
 
-import java.util.Collection;
-
-import org.apache.qpid.server.logging.LogRecord;
 import org.apache.qpid.server.model.Content;
 import org.apache.qpid.server.model.DerivedAttribute;
 import org.apache.qpid.server.model.KeyStore;

Added: qpid/java/trunk/broker-plugins/logging-logback/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/pom.xml?rev=1754771&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/pom.xml (added)
+++ qpid/java/trunk/broker-plugins/logging-logback/pom.xml Mon Aug  1 16:11:33 
2016
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.qpid</groupId>
+    <artifactId>qpid-java-build</artifactId>
+    <version>6.1.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>qpid-broker-plugins-logging-logback</artifactId>
+  <name>Apache Qpid LogBack Logging Broker Plug-in</name>
+  <description>LogBack Logging broker plug-in</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-broker-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-broker-codegen</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-version}</version>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-test-utils</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-broker-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>resources/</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
+</project>

Propchange: qpid/java/trunk/broker-plugins/logging-logback/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractBrokerLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractBrokerLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractBrokerLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractBrokerLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractBrokerLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractBrokerLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractBrokerLogger.java
 Mon Aug  1 16:11:33 2016
@@ -18,17 +18,19 @@
  * under the License.i
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.qpid.server.logging.LogInclusionRule;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.BrokerLogInclusionRule;
 import org.apache.qpid.server.model.BrokerLogger;
 import org.apache.qpid.server.model.ManagedAttributeField;
 
-public abstract class AbstractBrokerLogger<X extends AbstractBrokerLogger<X>> 
extends AbstractLogger<X> implements BrokerLogger<X>
+public abstract class AbstractBrokerLogger<X extends AbstractBrokerLogger<X>> 
extends AbstractLogger<X>
+        implements BrokerLogger<X>
 {
     @ManagedAttributeField
     private boolean _virtualHostLogEventExcluded;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
 Mon Aug  1 16:11:33 2016
@@ -18,10 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -32,11 +35,18 @@ import com.google.common.util.concurrent
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.qpid.server.logging.LogInclusionRule;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.BrokerLogInclusionRule;
 import org.apache.qpid.server.model.ConfigurationChangeListener;
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;
+import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.StateTransition;
+import org.apache.qpid.server.model.VirtualHostLogInclusionRule;
+import org.apache.qpid.server.plugin.ConfiguredObjectRegistration;
+import org.apache.qpid.server.plugin.QpidServiceLoader;
 
 public abstract class AbstractLogger<X extends AbstractLogger<X>> extends 
AbstractConfiguredObject<X>
 {
@@ -50,12 +60,12 @@ public abstract class AbstractLogger<X e
         addChangeListener(new LogInclusionRuleListener());
     }
 
-    protected final void addLogInclusionRule(LogInclusionRule logInclusionRule)
+    protected final void addLogInclusionRule(LogBackLogInclusionRule 
logInclusionRule)
     {
         _compositeFilter.addLogInclusionRule(logInclusionRule);
     }
 
-    protected final void removeLogInclusionRule(LogInclusionRule 
logInclusionRule)
+    protected final void removeLogInclusionRule(LogBackLogInclusionRule 
logInclusionRule)
     {
         _compositeFilter.removeLogInclusionRule(logInclusionRule);
     }
@@ -72,7 +82,7 @@ public abstract class AbstractLogger<X e
 
         for(LogInclusionRule logInclusionRule : getLogInclusionRules())
         {
-            _compositeFilter.addLogInclusionRule(logInclusionRule);
+            
_compositeFilter.addLogInclusionRule((LogBackLogInclusionRule)logInclusionRule);
         }
         appender.addFilter(_compositeFilter);
 
@@ -145,18 +155,18 @@ public abstract class AbstractLogger<X e
         @Override
         public void childAdded(final ConfiguredObject<?> object, final 
ConfiguredObject<?> child)
         {
-            if (child instanceof LogInclusionRule)
+            if (child instanceof LogBackLogInclusionRule)
             {
-                addLogInclusionRule((LogInclusionRule) child);
+                addLogInclusionRule((LogBackLogInclusionRule) child);
             }
         }
 
         @Override
         public void childRemoved(final ConfiguredObject<?> object, final 
ConfiguredObject<?> child)
         {
-            if (child instanceof LogInclusionRule)
+            if (child instanceof LogBackLogInclusionRule)
             {
-                removeLogInclusionRule((LogInclusionRule) child);
+                removeLogInclusionRule((LogBackLogInclusionRule) child);
             }
         }
 
@@ -183,4 +193,47 @@ public abstract class AbstractLogger<X e
         {
         }
     }
+
+    public static Map<String, Collection<String>> 
getSupportedVirtualHostLoggerChildTypes()
+    {
+        return getSupportedLoggerChildTypes(VirtualHostLogInclusionRule.class);
+    }
+
+    public static Map<String, Collection<String>> 
getSupportedBrokerLoggerChildTypes()
+    {
+        return getSupportedLoggerChildTypes(BrokerLogInclusionRule.class);
+    }
+
+    private static Map<String, Collection<String>> 
getSupportedLoggerChildTypes(Class<? extends ConfiguredObject> clazz)
+    {
+        return Collections.singletonMap(clazz.getSimpleName(), 
getSupportedLogInclusionRules(clazz));
+    }
+
+
+    private static Collection<String> getSupportedLogInclusionRules(Class<? 
extends ConfiguredObject> clazz)
+    {
+
+        final Iterable<ConfiguredObjectRegistration> registrations =
+                (new 
QpidServiceLoader()).instancesOf(ConfiguredObjectRegistration.class);
+
+        Set<String> supportedTypes = new HashSet<>();
+
+        for(ConfiguredObjectRegistration registration : registrations)
+        {
+            for(Class<? extends ConfiguredObject> typeClass : 
registration.getConfiguredObjectClasses())
+            {
+                if(clazz.isAssignableFrom(typeClass))
+                {
+                    ManagedObject annotation = 
typeClass.getAnnotation(ManagedObject.class);
+
+                    if (annotation.creatable() && 
annotation.defaultType().equals("") && 
LogBackLogInclusionRule.class.isAssignableFrom(typeClass))
+                    {
+                        
supportedTypes.add(ConfiguredObjectTypeRegistry.getType(typeClass));
+                    }
+                }
+            }
+        }
+        return Collections.unmodifiableCollection(supportedTypes);
+    }
+
 }

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelLogInclusionRule.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelLogInclusionRule.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelLogInclusionRule.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.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;
 
@@ -28,6 +28,7 @@ import ch.qos.logback.core.filter.Filter
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
+import org.apache.qpid.server.logging.LogLevel;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.ManagedAttributeField;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractVirtualHostLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractVirtualHostLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractVirtualHostLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractVirtualHostLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractVirtualHostLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractVirtualHostLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractVirtualHostLogger.java
 Mon Aug  1 16:11:33 2016
@@ -18,16 +18,18 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.qpid.server.logging.LogInclusionRule;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.model.VirtualHostLogger;
 import org.apache.qpid.server.model.VirtualHostLogInclusionRule;
 
-public abstract class AbstractVirtualHostLogger <X extends 
AbstractVirtualHostLogger<X>> extends AbstractLogger<X> implements 
VirtualHostLogger<X>
+public abstract class AbstractVirtualHostLogger <X extends 
AbstractVirtualHostLogger<X>> extends AbstractLogger<X>
+        implements VirtualHostLogger<X>
 {
 
     private final VirtualHost<?> _virtualHost;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.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;
 
@@ -33,7 +33,6 @@ import ch.qos.logback.core.rolling.SizeB
 import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
 import ch.qos.logback.core.rolling.TriggeringPolicy;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.logback.RollingPolicyDecorator;
 
 public class AppenderUtils
 {

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLogger.java
 Mon Aug  1 16:11:33 2016
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import org.apache.qpid.server.model.BrokerLogger;
 import org.apache.qpid.server.model.ManagedAttribute;
 import org.apache.qpid.server.model.ManagedObject;
 
-@ManagedObject( category = false, type = BrokerConsoleLogger.TYPE)
+@ManagedObject( category = false, type = BrokerConsoleLogger.TYPE, 
validChildTypes = 
"org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
 public interface BrokerConsoleLogger<X extends BrokerConsoleLogger<X>> extends 
BrokerLogger<X>
 {
     String TYPE = "Console";
@@ -32,7 +32,7 @@ public interface BrokerConsoleLogger<X e
     @ManagedAttribute(defaultValue = "%date %-5level [%thread] 
\\(%logger{2}\\) - %msg%n")
     String getLayout();
 
-    @ManagedAttribute(defaultValue = "STDOUT", validValues = 
{"org.apache.qpid.server.logging.BrokerConsoleLoggerImpl#getAllConsoleStreamTarget()"})
+    @ManagedAttribute(defaultValue = "STDOUT", validValues = 
{"org.apache.qpid.server.logging.logback.BrokerConsoleLoggerImpl#getAllConsoleStreamTarget()"})
     ConsoleStreamTarget getConsoleStreamTarget();
 
     enum ConsoleStreamTarget

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLoggerImpl.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLoggerImpl.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.Collection;
@@ -36,7 +36,8 @@ import org.apache.qpid.server.model.Brok
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
 
-public class BrokerConsoleLoggerImpl extends 
AbstractBrokerLogger<BrokerConsoleLoggerImpl> implements 
BrokerConsoleLogger<BrokerConsoleLoggerImpl>
+public class BrokerConsoleLoggerImpl extends 
AbstractBrokerLogger<BrokerConsoleLoggerImpl>
+        implements BrokerConsoleLogger<BrokerConsoleLoggerImpl>
 {
     @ManagedAttributeField
     private String _layout;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
 Mon Aug  1 16:11:33 2016
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.qpid.server.logging.LogFileDetails;
 import org.apache.qpid.server.model.BrokerLogger;
 import org.apache.qpid.server.model.DerivedAttribute;
 import org.apache.qpid.server.model.ManagedAttribute;
@@ -33,7 +33,7 @@ import org.apache.qpid.server.model.Mana
 import org.apache.qpid.server.model.Param;
 import org.apache.qpid.server.model.Content;
 
-@ManagedObject( category = false, type = BrokerFileLogger.TYPE)
+@ManagedObject( category = false, type = BrokerFileLogger.TYPE, 
validChildTypes = 
"org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
 public interface BrokerFileLogger<X extends BrokerFileLogger<X>> extends 
BrokerLogger<X>
 {
     String TYPE = "File";

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.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.io.IOError;
@@ -38,8 +38,8 @@ import ch.qos.logback.core.rolling.Rolli
 import ch.qos.logback.core.status.Status;
 import ch.qos.logback.core.status.StatusListener;
 import ch.qos.logback.core.status.StatusManager;
-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.logging.messages.BrokerMessages;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -48,12 +48,12 @@ import org.apache.qpid.server.model.Mana
 import org.apache.qpid.server.model.Content;
 import org.apache.qpid.server.model.Param;
 import org.apache.qpid.server.model.SystemConfig;
-import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.util.DaemonThreadFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BrokerFileLoggerImpl extends 
AbstractBrokerLogger<BrokerFileLoggerImpl> implements 
BrokerFileLogger<BrokerFileLoggerImpl>, FileLoggerSettings
+public class BrokerFileLoggerImpl extends 
AbstractBrokerLogger<BrokerFileLoggerImpl>
+        implements BrokerFileLogger<BrokerFileLoggerImpl>, FileLoggerSettings
 {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(BrokerFileLoggerImpl.class);
 

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.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 java.util.Map;
 
@@ -28,7 +28,8 @@ import org.apache.qpid.server.model.Mana
 import org.apache.qpid.server.model.ManagedObject;
 
 @ManagedObject( category = false, type = BrokerLogbackSocketLogger.TYPE,
-                description = "Logger implementation that writes log events to 
a remote logback server")
+                description = "Logger implementation that writes log events to 
a remote logback server",
+                validChildTypes = 
"org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
 public interface BrokerLogbackSocketLogger<X extends 
BrokerLogbackSocketLogger<X>> extends BrokerLogger<X>
 {
     String TYPE = "BrokerLogbackSocket";

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLoggerImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLoggerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
 Mon Aug  1 16:11:33 2016
@@ -19,16 +19,14 @@
  *
  */
 
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.net.SocketAppender;
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.classic.spi.LoggingEventVO;
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.util.Duration;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLogger.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.Collection;
 
@@ -29,7 +29,8 @@ import org.apache.qpid.server.model.Mana
 import org.apache.qpid.server.model.ManagedOperation;
 import org.apache.qpid.server.model.Param;
 
-@ManagedObject( category = false, type = BrokerMemoryLogger.TYPE)
+@ManagedObject( category = false, type = BrokerMemoryLogger.TYPE,
+                validChildTypes = 
"org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
 public interface BrokerMemoryLogger<X extends BrokerMemoryLogger<X>> extends 
BrokerLogger<X>
 {
     String MAX_RECORDS = "maxRecords";

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerImpl.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerImpl.java
 Mon Aug  1 16:11:33 2016
@@ -18,11 +18,10 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -36,7 +35,6 @@ import org.apache.qpid.server.model.Brok
 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.security.access.Operation;
 
 public class BrokerMemoryLoggerImpl extends 
AbstractBrokerLogger<BrokerMemoryLoggerImpl> implements 
BrokerMemoryLogger<BrokerMemoryLoggerImpl>
 {

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRule.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRule.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRule.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRule.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRule.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRule.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRule.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.BrokerLogInclusionRule;
 import org.apache.qpid.server.model.ManagedAttribute;
 import org.apache.qpid.server.model.ManagedObject;
 
 @ManagedObject( category = false, type = 
BrokerNameAndLevelLogInclusionRule.TYPE)
-public interface BrokerNameAndLevelLogInclusionRule<X extends 
BrokerNameAndLevelLogInclusionRule<X>> extends BrokerLogInclusionRule<X>
+public interface BrokerNameAndLevelLogInclusionRule<X extends 
BrokerNameAndLevelLogInclusionRule<X>> extends BrokerLogInclusionRule<X>, 
LogBackLogInclusionRule
 {
 
     String TYPE = "NameAndLevel";

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.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/BrokerSyslogLogger.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLogger.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLogger.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLogger.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.model.BrokerLogger;
 import org.apache.qpid.server.model.ManagedAttribute;
 import org.apache.qpid.server.model.ManagedObject;
 
-@ManagedObject( category = false, type = BrokerSyslogLogger.TYPE)
+@ManagedObject( category = false, type = BrokerSyslogLogger.TYPE,
+                validChildTypes = 
"org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
 public interface BrokerSyslogLogger<X extends BrokerSyslogLogger<X>> extends 
BrokerLogger<X>
 {
     String TYPE = "Syslog";

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLoggerImpl.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLoggerImpl.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLoggerImpl.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLoggerImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLoggerImpl.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLoggerImpl.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLoggerImpl.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 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.Broker;
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/CompositeFilter.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeFilter.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/CompositeFilter.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/CompositeFilter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeFilter.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/CompositeFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/CompositeFilter.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 ch.qos.logback.classic.Level.ERROR_INT;
 import static ch.qos.logback.classic.Level.WARN_INT;
@@ -40,14 +40,14 @@ public class CompositeFilter extends Fil
     private final AtomicLong _warnCount = new AtomicLong();
     private final AtomicLong _errorCount = new AtomicLong();
 
-    public void addLogInclusionRule(LogInclusionRule logInclusionRule)
+    public void addLogInclusionRule(LogBackLogInclusionRule logInclusionRule)
     {
         Filter<ILoggingEvent> f = logInclusionRule.asFilter();
         f.setName(logInclusionRule.getName());
         _filterList.add(f);
     }
 
-    public void removeLogInclusionRule(LogInclusionRule logInclusionRule)
+    public void removeLogInclusionRule(LogBackLogInclusionRule 
logInclusionRule)
     {
         Iterator<Filter<ILoggingEvent>> it = _filterList.iterator();
         while(it.hasNext())

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/EffectiveLevelFilter.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/EffectiveLevelFilter.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/EffectiveLevelFilter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/EffectiveLevelFilter.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 ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/FileLoggerSettings.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/FileLoggerSettings.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/FileLoggerSettings.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/FileLoggerSettings.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/FileLoggerSettings.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/FileLoggerSettings.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/FileLoggerSettings.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.ScheduledExecutorService;
 

Added: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java?rev=1754771&view=auto
==============================================================================
--- 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java
 (added)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java
 Mon Aug  1 16:11:33 2016
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging.logback;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+
+import org.apache.qpid.server.logging.LogInclusionRule;
+
+public interface LogBackLogInclusionRule extends LogInclusionRule
+{
+    Filter<ILoggingEvent> asFilter();
+
+}

Propchange: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecord.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecord.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecord.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecord.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecord.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecord.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecord.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 ch.qos.logback.classic.spi.ILoggingEvent;
 import org.apache.qpid.server.model.ManagedAttributeValueType;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
 Mon Aug  1 16:11:33 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.qpid.server.logging;
+package org.apache.qpid.server.logging.logback;
 
 import java.util.Collections;
 import java.util.Iterator;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.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 ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PrincipalLogEventFilter.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PrincipalLogEventFilter.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/PrincipalLogEventFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.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,8 +29,10 @@ import ch.qos.logback.classic.spi.ILoggi
 import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.spi.FilterReply;
 
+import org.apache.qpid.server.logging.LogInclusionRule;
 
-public class PrincipalLogEventFilter extends Filter<ILoggingEvent> implements 
LogInclusionRule
+
+public class PrincipalLogEventFilter extends Filter<ILoggingEvent> implements 
LogBackLogInclusionRule
 {
     private final Principal _principal;
 

Copied: 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
 (from r1754770, 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java)
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java?p2=qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java&r1=1754770&r2=1754771&rev=1754771&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
 (original)
+++ 
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.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.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;




---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org