This is an automated email from the ASF dual-hosted git repository. klund pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git.
from 6c82780 Merge pull request #2840 from onichols-pivotal/GEODE-6040-fix-deploy-meta add efd8a14 GEODE-2644: Define interfaces for new Log4j2 Appenders add 763e417 GEODE-2644: Cleanup logging related files add 5e61da5 GEODE-2644: Add LogFileAssert and LogLevelAssert assertions add 731cd2a GEODE-2644: Add AlertingTest JUnit Category add a77c94b GEODE-2644: Add LogConfig and StatisticsConfig for logging add 02c3cae GEODE-2644: Make AlertAppender optional and support log4j2.xml add cd2bba1 GEODE-2644: Expand DistributedSystemMXBean tests add 591f3f7 GEODE-2644: Make LogWriterAppender optional and support log4j2.xml add 0a8f3df GEODE-5637: Fix flaky SingleHopClientExecutorWithLoggingIntegrationTest add 688f58a GEODE-2644: Update session state caching dependencies for logging add 6691d31 GEODE-2644: Remove log level from MonitorQueryUnderContentionBenchmark No new revisions were added by this update. Summary of changes: extensions/geode-modules-assembly/build.gradle | 1 + .../release/session/bin/modify_war | 1 + .../apache/geode/session/tests/TomcatInstall.java | 4 +- .../GfshStartLocatorLogAcceptanceTest.java | 36 +- .../org/apache/geode/annotations/TestingOnly.java | 2 +- .../alerting/AlertingServiceDistributedTest.java | 399 +++++ ...rtingServiceWithoutListenerDistributedTest.java | 217 +++ .../LoggingWithReconnectDistributedTest.java | 210 +++ .../management/DistributedSystemDUnitTest.java | 575 ------- .../DistributedSystemMXBeanDistributedTest.java | 202 +++ ...butedSystemMXBeanWithAlertsDistributedTest.java | 495 ++++++ ...stemMXBeanWithNotificationsDistributedTest.java | 243 +++ .../DeprecatedAgentLauncherIntegrationTest.java | 11 +- ...opClientExecutorWithLoggingIntegrationTest.java | 36 +- .../LocatorLauncherIntegrationTestCase.java | 2 +- .../internal/InternalLocatorIntegrationTest.java | 76 - .../gms/messenger/JGroupsMessengerJUnitTest.java | 9 +- .../AlertListenerRegistrationIntegrationTest.java | 183 +++ .../AlertingServiceWithClusterIntegrationTest.java | 274 ++++ .../AlertingServiceWithLonerIntegrationTest.java | 89 ++ .../logging/BannerLoggingIntegrationTest.java | 129 ++ .../logging/ConfigurationInfoIntegrationTest.java} | 24 +- .../logging/ConfigurationIntegrationTest.java | 133 ++ .../DistributedSystemLogFileIntegrationTest.java | 1152 -------------- .../logging/LocatorLogFileIntegrationTest.java | 123 -- .../LogLevelChangesWithCacheIntegrationTest.java | 150 ++ ...hangesWithDistributedSystemIntegrationTest.java | 167 ++ ...llingWithDistributedSystemIntegrationTest.java} | 33 +- .../logging/LogServiceIntegrationTest.java | 236 --- ...oggingWithDistributedSystemIntegrationTest.java | 1597 ++++++++++++++++++++ .../logging/LoggingWithLocatorIntegrationTest.java | 207 +++ .../LoggingWithLocatorLauncherIntegrationTest.java | 65 + .../LoggingWithServerLauncherIntegrationTest.java | 65 + .../ManagerLogWriterFactoryIntegrationTest.java | 152 ++ .../logging/MergeLogFilesIntegrationTest.java | 2 +- .../geode/internal/logging/NonBlankStrings.java | 17 +- ...StartupConfigurationLoggingIntegrationTest.java | 159 ++ ...stemOutRuleAndSystemErrRuleIntegrationTest.java | 98 ++ .../log4j/AlertAppenderIntegrationTest.java | 261 ++++ .../BothLogWriterAppendersIntegrationTest.java | 180 +++ ...> CacheWithCustomLogConfigIntegrationTest.java} | 30 +- .../CacheWithDefaultAppendersIntegrationTest.java | 96 ++ ...gurationWithLogLevelChangesIntegrationTest.java | 226 +++ ...penderWithLoggerContextRuleIntegrationTest.java | 70 +- ...leAppenderWithSystemOutRuleIntegrationTest.java | 182 --- ...mWithBothLogWriterAppendersIntegrationTest.java | 203 +++ ...edSystemWithLogLevelChangesIntegrationTest.java | 207 +++ .../logging/log4j/FastLoggerIntegrationTest.java | 411 ++--- ...FastLoggerWithDefaultConfigIntegrationTest.java | 53 +- ...reVerboseMarkerFilterAcceptIntegrationTest.java | 26 +- ...fireVerboseMarkerFilterDenyIntegrationTest.java | 26 +- .../log4j/GeodeConsoleAppenderIntegrationTest.java | 210 +++ ...odeConsoleAppenderWithCacheIntegrationTest.java | 168 ++ ...leAppenderWithSystemOutRuleIntegrationTest.java | 98 ++ ...deVerboseMarkerFilterAcceptIntegrationTest.java | 26 +- ...eodeVerboseMarkerFilterDenyIntegrationTest.java | 26 +- ...ServiceWithCustomLogConfigIntegrationTest.java} | 32 +- .../log4j/LogWriterAppenderIntegrationTest.java | 341 ++--- ...LogWriterAppenderWithLimitsIntegrationTest.java | 147 ++ ...AppenderWithMemberNameInXmlIntegrationTest.java | 148 ++ .../SecurityLogWriterAppenderIntegrationTest.java | 136 ++ .../DistributedSystemMXBeanIntegrationTest.java | 93 +- .../MemberMXBeanShowLogIntegrationTest.java | 186 +++ .../ChangeLogLevelFunctionIntegrationTest.java | 164 ++ ...tExecutorWithLoggingIntegrationTest_log4j2.xml} | 11 +- .../apache/geode/codeAnalysis/excludedClasses.txt | 9 +- ...xml => AlertAppenderIntegrationTest_log4j2.xml} | 11 +- ...thLogWriterAppendersIntegrationTest_log4j2.xml} | 19 +- ...eWithCustomLogConfigIntegrationTest_log4j2.xml} | 2 +- ...nWithLogLevelChangesIntegrationTest_log4j2.xml} | 13 +- ...WithLoggerContextRuleIntegrationTest_log4j2.xml | 26 +- ...thLogWriterAppendersIntegrationTest_log4j2.xml} | 19 +- ...mWithLogLevelChangesIntegrationTest_log4j2.xml} | 13 +- ...oseMarkerFilterAcceptIntegrationTest_log4j2.xml | 2 +- ...rboseMarkerFilterDenyIntegrationTest_log4j2.xml | 2 +- ...GeodeConsoleAppenderIntegrationTest_log4j2.xml} | 11 +- ...oleAppenderWithCacheIntegrationTest_log4j2.xml} | 19 +- ...derWithSystemOutRuleIntegrationTest_log4j2.xml} | 11 +- ...oseMarkerFilterAcceptIntegrationTest_log4j2.xml | 2 +- ...rboseMarkerFilterDenyIntegrationTest_log4j2.xml | 2 +- ...eWithCustomLogConfigIntegrationTest_log4j2.xml} | 2 +- ...=> LogWriterAppenderIntegrationTest_log4j2.xml} | 11 +- ...erAppenderWithLimitsIntegrationTest_log4j2.xml} | 13 +- ...rWithMemberNameInXmlIntegrationTest_log4j2.xml} | 13 +- ...ityLogWriterAppenderIntegrationTest_log4j2.xml} | 18 +- .../MonitorQueryUnderContentionBenchmark.java | 8 - .../logging/log4j/CacheLoggingBenchmark.java | 116 ++ .../logging/log4j/LogWriterAppenderBenchmark.java | 124 ++ .../admin/internal/AdminDistributedSystemImpl.java | 27 +- .../internal/DistributedSystemConfigImpl.java | 46 + .../apache/geode/admin/jmx/internal/AgentImpl.java | 111 +- .../internal/AbstractDistributionConfig.java | 5 + .../internal/ClusterDistributionManager.java | 21 +- .../distributed/internal/DistributionConfig.java | 11 +- .../distributed/internal/DistributionManager.java | 8 +- .../internal/InternalDistributedSystem.java | 151 +- .../distributed/internal/InternalLocator.java | 107 +- .../internal/LonerDistributionManager.java | 7 + .../internal/RuntimeDistributionConfigImpl.java | 12 +- .../distributed/internal/direct/DirectChannel.java | 5 +- .../membership/gms/messenger/JGroupsMessenger.java | 5 +- .../membership/gms/mgr/GMSMembershipManager.java | 2 +- .../java/org/apache/geode/internal/Banner.java | 94 +- .../apache/geode/internal/DistributionLocator.java | 1 - .../apache/geode/internal/VersionDescription.java | 37 +- .../remote/AdminConsoleDisconnectMessage.java | 31 +- .../internal/admin/remote/AdminConsoleMessage.java | 21 +- .../admin/remote/AlertLevelChangeMessage.java | 12 +- .../admin/remote/AlertListenerMessage.java | 44 + .../internal/admin/remote/TailLogResponse.java | 38 +- .../apache/geode/internal/alerting/AlertLevel.java | 53 + .../alerting/AlertListenerMessageFactory.java | 50 + .../geode/internal/alerting/AlertMessaging.java | 100 ++ .../geode/internal/alerting/AlertingAction.java} | 34 +- .../geode/internal/alerting/AlertingProvider.java} | 29 +- .../alerting/AlertingProviderRegistry.java | 80 + .../geode/internal/alerting/AlertingService.java | 57 + .../geode/internal/alerting/AlertingSession.java | 107 ++ .../internal/alerting/AlertingSessionListener.java | 17 +- .../alerting/AlertingSessionListeners.java | 78 + .../internal/alerting/NullAlertingProvider.java} | 38 +- .../NullAlertingService.java} | 44 +- .../geode/internal/logging/Configuration.java | 237 +++ .../geode/internal/logging/ConfigurationInfo.java | 56 + .../geode/internal/logging/DateFormatter.java | 15 +- .../geode/internal/logging/GemFireFormatter.java | 37 +- .../geode/internal/logging/GemFireHandler.java | 24 +- .../geode/internal/logging/InternalLogWriter.java | 2 - .../geode/internal/logging/LocalLogWriter.java | 4 +- .../apache/geode/internal/logging/LogConfig.java | 57 +- .../geode/internal/logging/LogConfigListener.java | 17 +- .../geode/internal/logging/LogConfigSupplier.java | 35 +- .../org/apache/geode/internal/logging/LogFile.java | 37 +- .../geode/internal/logging/LogFileDetails.java | 21 +- .../geode/internal/logging/LogFileParser.java | 164 +- .../geode/internal/logging/LogMessageRegex.java | 106 ++ .../apache/geode/internal/logging/LogService.java | 249 +-- .../geode/internal/logging/LogWriterFactory.java | 81 +- .../geode/internal/logging/LogWriterImpl.java | 16 +- .../geode/internal/logging/LogWriterLevel.java | 40 +- .../geode/internal/logging/LoggingSession.java | 119 ++ .../internal/logging/LoggingSessionListener.java | 58 + .../internal/logging/LoggingSessionListeners.java | 100 ++ .../geode/internal/logging/LoggingThread.java | 7 +- .../internal/logging/LoggingThreadFactory.java | 14 +- .../geode/internal/logging/LoggingThreadGroup.java | 83 +- .../logging/LoggingUncaughtExceptionHandler.java | 36 +- .../geode/internal/logging/ManagerLogWriter.java | 55 +- .../internal/logging/ManagerLogWriterFactory.java | 176 +++ .../geode/internal/logging/MergeLogFiles.java | 222 ++- .../apache/geode/internal/logging/NullLogFile.java | 41 +- .../{SecurityLogConfig.java => NullLogWriter.java} | 44 +- .../internal/logging/NullLoggingSession.java} | 35 +- .../geode/internal/logging/NullProviderAgent.java} | 35 +- ...tandardErrorPrinter.java => ProviderAgent.java} | 30 +- .../geode/internal/logging/PureLogWriter.java | 9 +- .../geode/internal/logging/SecurityLogConfig.java | 32 +- .../geode/internal/logging/SecurityLogWriter.java | 12 +- .../internal/logging/SecurityManagerLogWriter.java | 15 +- .../geode/internal/logging/SessionContext.java} | 50 +- .../apache/geode/internal/logging/SortLogFile.java | 59 +- .../internal/logging/StandardErrorPrinter.java | 6 +- .../internal/logging/StandardOutputPrinter.java | 6 +- .../internal/logging/log4j/AlertAppender.java | 474 +++--- .../geode/internal/logging/log4j/AlertLevel.java | 61 - .../logging/log4j/AlertLevelConverter.java | 88 ++ .../internal/logging/log4j/AlertListener.java | 66 + .../geode/internal/logging/log4j/Configurator.java | 186 --- .../DebuggableAppender.java} | 12 +- .../logging/log4j/GeodeConsoleAppender.java | 305 ++++ .../geode/internal/logging/log4j/Log4jAgent.java | 294 ++++ .../geode/internal/logging/log4j/LogLevel.java | 162 +- .../internal/logging/log4j/LogWriterAppender.java | 441 ++++-- .../internal/logging/log4j/LogWriterAppenders.java | 293 ---- .../logging/log4j/LogWriterLevelConverter.java | 97 ++ .../internal/logging/log4j/LogWriterLogger.java | 23 +- .../logging/log4j/MemberNamePatternConverter.java | 64 + .../internal/logging/log4j/MemberNameSupplier.java | 22 +- .../PausableAppender.java} | 10 +- .../log4j/message/GemFireParameterizedMessage.java | 15 +- .../GemFireParameterizedMessageFactory.java | 4 +- .../security/IntegratedSecurityService.java | 4 +- .../security/shiro/SecurityManagerProvider.java | 4 +- .../internal/statistics/GemFireStatSampler.java | 7 +- .../geode/internal/statistics/HostStatSampler.java | 20 + .../internal/statistics/StatArchiveHandler.java | 21 +- .../statistics/StatArchiveHandlerConfig.java | 16 +- .../internal/statistics/StatisticsConfig.java | 52 + .../org/apache/geode/internal/tcp/Connection.java | 4 +- .../apache/geode/internal/tcp/ConnectionTable.java | 22 +- .../org/apache/geode/internal/tcp/TCPConduit.java | 4 +- .../management/internal/ManagerStartupMessage.java | 4 +- .../internal/beans/MemberMBeanBridge.java | 9 +- .../cli/commands/DiskStoreCommandsUtils.java | 3 +- .../cli/functions/ChangeLogLevelFunction.java | 28 +- geode-core/src/main/resources/log4j2-cli.xml | 2 +- geode-core/src/main/resources/log4j2.xml | 18 +- .../geode/internal/logging/log4j/log4j2-legacy.xml | 2 +- .../sanctioned-geode-core-serializables.txt | 1 - .../internal/DistributedSystemConfigImplTest.java | 57 + .../java/org/apache/geode/internal/BannerTest.java | 59 + .../geode/internal/alerting/AlertLevelTest.java | 113 ++ .../alerting/AlertListenerMessageFactoryTest.java | 68 + .../internal/alerting/AlertMessagingTest.java | 108 ++ .../internal/alerting/AlertingActionTest.java | 54 + .../alerting/AlertingProviderRegistryTest.java | 94 ++ .../internal/alerting/AlertingServiceTest.java | 75 + .../alerting/NullAlertingProviderTest.java | 48 + .../geode/internal/logging/ConfigurationTest.java | 382 +++++ ...essageRegexMatchesStartupConfigurationTest.java | 227 +++ .../internal/logging/LogMessageRegexTest.java | 242 +++ .../geode/internal/logging/LogServiceTest.java | 129 +- .../geode/internal/logging/LogWriterImplTest.java | 3 + .../geode/internal/logging/LogWriterLevelTest.java | 73 +- .../geode/internal/logging/LoggingSessionTest.java | 219 +++ .../internal/logging/LoggingThreadFactoryTest.java | 6 + .../geode/internal/logging/LoggingThreadTest.java | 7 + .../LoggingUncaughtExceptionHandlerTest.java | 7 +- ...terLevelTest.java => ManagerLogWriterTest.java} | 25 +- .../geode/internal/logging/SortLogFileTest.java | 2 +- .../internal/logging/log4j/AlertAppenderTest.java | 314 ++-- .../logging/log4j/AlertLevelConverterTest.java | 144 ++ .../internal/logging/log4j/AlertLevelTest.java | 137 -- .../internal/logging/log4j/FastLoggerTest.java | 2 +- .../log4j/HexThreadIdPatternConverterTest.java | 4 + .../geode/internal/logging/log4j/LogLevelTest.java | 183 +-- .../logging/log4j/LogWriterLevelConverterTest.java | 132 ++ .../log4j/MemberNamePatternConverterTest.java | 57 + .../org/apache/geode/test/golden/log4j2-test.xml | 2 +- .../tomcat_installing_the_module.html.md.erb | 1 + .../apache/geode/test/dunit/LogWriterUtils.java | 4 +- .../geode/test/dunit/standalone/DUnitLauncher.java | 9 +- .../internal/logging/TestLogWriterFactory.java | 5 +- .../apache/geode/management/MXBeanAwaitility.java | 0 .../apache/geode/test/assertj/LogFileAssert.java | 23 +- .../apache/geode/test/assertj/LogLevelAssert.java | 23 +- .../assertj/internal/AbstractLogFileAssert.java | 206 +++ .../assertj/internal/AbstractLogLevelAssert.java | 46 + .../internal/ShouldBeLessSpecificThan.java} | 29 +- .../geode/test/junit/categories/AlertingTest.java | 17 +- .../accessible/AccessibleTemporaryFolder.java | 19 +- .../apache/geode/test/process/ProcessWrapper.java | 2 +- .../security/LogNoPasswordDistributedTest.java} | 2 +- 243 files changed, 15851 insertions(+), 6068 deletions(-) create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/internal/alerting/AlertingServiceDistributedTest.java create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/internal/alerting/AlertingServiceWithoutListenerDistributedTest.java create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/internal/logging/LoggingWithReconnectDistributedTest.java delete mode 100644 geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemDUnitTest.java create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanDistributedTest.java create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithAlertsDistributedTest.java create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/management/DistributedSystemMXBeanWithNotificationsDistributedTest.java delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalLocatorIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/alerting/AlertListenerRegistrationIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/alerting/AlertingServiceWithClusterIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/alerting/AlertingServiceWithLonerIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/BannerLoggingIntegrationTest.java copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => integrationTest/java/org/apache/geode/internal/logging/ConfigurationInfoIntegrationTest.java} (59%) create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/ConfigurationIntegrationTest.java delete mode 100755 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileIntegrationTest.java delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LocatorLogFileIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogLevelChangesWithCacheIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogLevelChangesWithDistributedSystemIntegrationTest.java rename geode-core/src/integrationTest/java/org/apache/geode/internal/logging/{CacheLogRollingIntegrationTest.java => LogRollingWithDistributedSystemIntegrationTest.java} (91%) delete mode 100755 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LogServiceIntegrationTest.java create mode 100755 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LoggingWithDistributedSystemIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LoggingWithLocatorIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LoggingWithLocatorLauncherIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/LoggingWithServerLauncherIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/ManagerLogWriterFactoryIntegrationTest.java copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-core/src/integrationTest/java/org/apache/geode/internal/logging/NonBlankStrings.java (69%) create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/StartupConfigurationLoggingIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/SystemOutRuleAndSystemErrRuleIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/AlertAppenderIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/BothLogWriterAppendersIntegrationTest.java rename geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/{CustomConfigWithCacheIntegrationTest.java => CacheWithCustomLogConfigIntegrationTest.java} (89%) create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/CacheWithDefaultAppendersIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConfigurationWithLogLevelChangesIntegrationTest.java delete mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/ConsoleAppenderWithSystemOutRuleIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/DistributedSystemWithBothLogWriterAppendersIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/DistributedSystemWithLogLevelChangesIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeConsoleAppenderIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeConsoleAppenderWithCacheIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/GeodeConsoleAppenderWithSystemOutRuleIntegrationTest.java rename geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/{CustomConfigWithLogServiceIntegrationTest.java => LogServiceWithCustomLogConfigIntegrationTest.java} (83%) create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderWithLimitsIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderWithMemberNameInXmlIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/internal/logging/log4j/SecurityLogWriterAppenderIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/management/MemberMXBeanShowLogIntegrationTest.java create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunctionIntegrationTest.java copy geode-core/src/integrationTest/resources/org/apache/geode/{internal/logging/log4j/GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => cache/client/internal/SingleHopClientExecutorWithLoggingIntegrationTest_log4j2.xml} (81%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => AlertAppenderIntegrationTest_log4j2.xml} (80%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => BothLogWriterAppendersIntegrationTest_log4j2.xml} (65%) rename geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{CustomConfigWithCacheIntegrationTest_log4j2.xml => CacheWithCustomLogConfigIntegrationTest_log4j2.xml} (96%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => ConfigurationWithLogLevelChangesIntegrationTest_log4j2.xml} (75%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => DistributedSystemWithBothLogWriterAppendersIntegrationTest_log4j2.xml} (66%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => DistributedSystemWithLogLevelChangesIntegrationTest_log4j2.xml} (75%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => GeodeConsoleAppenderIntegrationTest_log4j2.xml} (81%) rename geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{ConsoleAppenderWithSystemOutRuleIntegrationTest_log4j2.xml => GeodeConsoleAppenderWithCacheIntegrationTest_log4j2.xml} (69%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => GeodeConsoleAppenderWithSystemOutRuleIntegrationTest_log4j2.xml} (81%) rename geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{CustomConfigWithLogServiceIntegrationTest_log4j2.xml => LogServiceWithCustomLogConfigIntegrationTest_log4j2.xml} (96%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => LogWriterAppenderIntegrationTest_log4j2.xml} (79%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => LogWriterAppenderWithLimitsIntegrationTest_log4j2.xml} (76%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => LogWriterAppenderWithMemberNameInXmlIntegrationTest_log4j2.xml} (74%) copy geode-core/src/integrationTest/resources/org/apache/geode/internal/logging/log4j/{GeodeVerboseMarkerFilterDenyIntegrationTest_log4j2.xml => SecurityLogWriterAppenderIntegrationTest_log4j2.xml} (69%) create mode 100644 geode-core/src/jmh/java/org/apache/geode/internal/logging/log4j/CacheLoggingBenchmark.java create mode 100644 geode-core/src/jmh/java/org/apache/geode/internal/logging/log4j/LogWriterAppenderBenchmark.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertLevel.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertListenerMessageFactory.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertMessaging.java copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => main/java/org/apache/geode/internal/alerting/AlertingAction.java} (55%) copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => main/java/org/apache/geode/internal/alerting/AlertingProvider.java} (54%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertingProviderRegistry.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertingService.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertingSession.java copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-core/src/main/java/org/apache/geode/internal/alerting/AlertingSessionListener.java (71%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/alerting/AlertingSessionListeners.java copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => main/java/org/apache/geode/internal/alerting/NullAlertingProvider.java} (53%) copy geode-core/src/main/java/org/apache/geode/internal/{logging/StandardErrorPrinter.java => alerting/NullAlertingService.java} (51%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/Configuration.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/ConfigurationInfo.java copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-core/src/main/java/org/apache/geode/internal/logging/LogConfigListener.java (71%) copy geode-junit/src/main/java/org/apache/geode/internal/logging/LogServiceIntegrationTestSupport.java => geode-core/src/main/java/org/apache/geode/internal/logging/LogFile.java (58%) mode change 100755 => 100644 copy geode-junit/src/main/java/org/apache/geode/internal/logging/LogServiceIntegrationTestSupport.java => geode-core/src/main/java/org/apache/geode/internal/logging/LogFileDetails.java (60%) mode change 100755 => 100644 create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/LogMessageRegex.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/LoggingSession.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/LoggingSessionListener.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/LoggingSessionListeners.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/ManagerLogWriterFactory.java copy geode-junit/src/main/java/org/apache/geode/internal/logging/LogServiceIntegrationTestSupport.java => geode-core/src/main/java/org/apache/geode/internal/logging/NullLogFile.java (57%) mode change 100755 => 100644 copy geode-core/src/main/java/org/apache/geode/internal/logging/{SecurityLogConfig.java => NullLogWriter.java} (51%) copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => main/java/org/apache/geode/internal/logging/NullLoggingSession.java} (61%) copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => main/java/org/apache/geode/internal/logging/NullProviderAgent.java} (56%) copy geode-core/src/main/java/org/apache/geode/internal/logging/{StandardErrorPrinter.java => ProviderAgent.java} (57%) copy geode-core/src/{test/java/org/apache/geode/internal/logging/LogWriterLevelTest.java => main/java/org/apache/geode/internal/logging/SessionContext.java} (52%) delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertLevel.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertLevelConverter.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/AlertListener.java delete mode 100755 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/Configurator.java copy geode-core/src/main/java/org/apache/geode/internal/logging/{LogConfigSupplier.java => log4j/DebuggableAppender.java} (78%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/GeodeConsoleAppender.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/Log4jAgent.java delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterLevelConverter.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/logging/log4j/MemberNamePatternConverter.java copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-core/src/main/java/org/apache/geode/internal/logging/log4j/MemberNameSupplier.java (65%) copy geode-core/src/main/java/org/apache/geode/internal/logging/{LogConfigSupplier.java => log4j/PausableAppender.java} (84%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsConfig.java create mode 100644 geode-core/src/test/java/org/apache/geode/admin/internal/DistributedSystemConfigImplTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/BannerTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/AlertLevelTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/AlertListenerMessageFactoryTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/AlertMessagingTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/AlertingActionTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/AlertingProviderRegistryTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/AlertingServiceTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/alerting/NullAlertingProviderTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/ConfigurationTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/LogMessageRegexMatchesStartupConfigurationTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/LogMessageRegexTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/LoggingSessionTest.java copy geode-core/src/test/java/org/apache/geode/internal/logging/{LogWriterLevelTest.java => ManagerLogWriterTest.java} (58%) create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertLevelConverterTest.java delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/log4j/AlertLevelTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLevelConverterTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/internal/logging/log4j/MemberNamePatternConverterTest.java rename {geode-dunit => geode-junit}/src/main/java/org/apache/geode/management/MXBeanAwaitility.java (100%) copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-junit/src/main/java/org/apache/geode/test/assertj/LogFileAssert.java (63%) copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-junit/src/main/java/org/apache/geode/test/assertj/LogLevelAssert.java (62%) create mode 100644 geode-junit/src/main/java/org/apache/geode/test/assertj/internal/AbstractLogFileAssert.java create mode 100644 geode-junit/src/main/java/org/apache/geode/test/assertj/internal/AbstractLogLevelAssert.java rename geode-junit/src/main/java/org/apache/geode/{internal/logging/LogServiceIntegrationTestSupport.java => test/assertj/internal/ShouldBeLessSpecificThan.java} (50%) mode change 100755 => 100644 copy geode-common/src/main/java/org/apache/geode/annotations/TestingOnly.java => geode-junit/src/main/java/org/apache/geode/test/junit/categories/AlertingTest.java (71%) copy geode-core/src/main/java/org/apache/geode/internal/logging/LogConfigSupplier.java => geode-junit/src/main/java/org/apache/geode/test/junit/rules/accessible/AccessibleTemporaryFolder.java (66%) rename geode-web/src/{integrationTest/java/org/apache/geode/management/internal/security/LogNoPasswordIntegrationTest.java => distributedTest/java/org/apache/geode/management/internal/security/LogNoPasswordDistributedTest.java} (98%)