From af896e531ef8b79bbb6c681ea1619555799d9f57 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Wed, 19 May 2021 16:09:40 -0700
Subject: [PATCH] Add test logging configuration to control the log output on
 test runs.

---
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 10 --------
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 24 +++++++++++++++++++
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 24 +++++++++++++++++++
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 24 +++++++++++++++++++
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 24 +++++++++++++++++++
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 24 +++++++++++++++++++
 .../resources/log4j2-test.xml                 | 19 +++++++++++++++
 .../resources/logback-test.xml                | 24 +++++++++++++++++++
 .../src/test/resources/log4j2-test.xml        | 19 +++++++++++++++
 .../src/test/resources/logback-test.xml       | 24 +++++++++++++++++++
 16 files changed, 320 insertions(+), 10 deletions(-)
 create mode 100644 docs/src/integration-test/resources/log4j2-test.xml
 rename spring-session-data-geode/src/integration-test/resources/logback.xml => docs/src/integration-test/resources/logback-test.xml (64%)
 create mode 100644 samples/boot/gemfire/src/integration-test/resources/log4j2-test.xml
 create mode 100644 samples/boot/gemfire/src/integration-test/resources/logback-test.xml
 create mode 100644 samples/javaconfig/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml
 create mode 100644 samples/javaconfig/gemfire-clientserver/src/integration-test/resources/logback-test.xml
 create mode 100644 samples/javaconfig/gemfire-p2p/src/integration-test/resources/log4j2-test.xml
 create mode 100644 samples/javaconfig/gemfire-p2p/src/integration-test/resources/logback-test.xml
 create mode 100644 samples/xml/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml
 create mode 100644 samples/xml/gemfire-clientserver/src/integration-test/resources/logback-test.xml
 create mode 100644 samples/xml/gemfire-p2p/src/integration-test/resources/log4j2-test.xml
 create mode 100644 samples/xml/gemfire-p2p/src/integration-test/resources/logback-test.xml
 create mode 100644 spring-session-data-geode/src/integration-test/resources/log4j2-test.xml
 create mode 100644 spring-session-data-geode/src/integration-test/resources/logback-test.xml
 create mode 100644 spring-session-data-geode/src/test/resources/log4j2-test.xml
 create mode 100644 spring-session-data-geode/src/test/resources/logback-test.xml

diff --git a/docs/src/integration-test/resources/log4j2-test.xml b/docs/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/docs/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/spring-session-data-geode/src/integration-test/resources/logback.xml b/docs/src/integration-test/resources/logback-test.xml
similarity index 64%
rename from spring-session-data-geode/src/integration-test/resources/logback.xml
rename to docs/src/integration-test/resources/logback-test.xml
index 31dd9cc..81706f7 100644
--- a/spring-session-data-geode/src/integration-test/resources/logback.xml
+++ b/docs/src/integration-test/resources/logback-test.xml
@@ -11,22 +11,12 @@
 
 	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
 
-	<appender name="testAppender" class="org.springframework.data.gemfire.test.logging.slf4j.logback.TestAppender">
-		<encoder>
-			<pattern>TEST - %m%n</pattern>
-		</encoder>
-	</appender>
-
 	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
 
 	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
 
 	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
 
-	<logger name="org.springframework.data.gemfire.config.annotation.support.RegionDataAccessTracingAspect" level="trace" additivity="false">
-		<appender-ref ref="testAppender"/>
-	</logger>
-
 	<root level="${logback.log.level:-ERROR}">
 		<appender-ref ref="console"/>
 	</root>
diff --git a/samples/boot/gemfire/src/integration-test/resources/log4j2-test.xml b/samples/boot/gemfire/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/samples/boot/gemfire/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/samples/boot/gemfire/src/integration-test/resources/logback-test.xml b/samples/boot/gemfire/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/samples/boot/gemfire/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>
diff --git a/samples/javaconfig/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml b/samples/javaconfig/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/samples/javaconfig/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/samples/javaconfig/gemfire-clientserver/src/integration-test/resources/logback-test.xml b/samples/javaconfig/gemfire-clientserver/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/samples/javaconfig/gemfire-clientserver/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>
diff --git a/samples/javaconfig/gemfire-p2p/src/integration-test/resources/log4j2-test.xml b/samples/javaconfig/gemfire-p2p/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/samples/javaconfig/gemfire-p2p/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/samples/javaconfig/gemfire-p2p/src/integration-test/resources/logback-test.xml b/samples/javaconfig/gemfire-p2p/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/samples/javaconfig/gemfire-p2p/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>
diff --git a/samples/xml/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml b/samples/xml/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/samples/xml/gemfire-clientserver/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/samples/xml/gemfire-clientserver/src/integration-test/resources/logback-test.xml b/samples/xml/gemfire-clientserver/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/samples/xml/gemfire-clientserver/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>
diff --git a/samples/xml/gemfire-p2p/src/integration-test/resources/log4j2-test.xml b/samples/xml/gemfire-p2p/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/samples/xml/gemfire-p2p/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/samples/xml/gemfire-p2p/src/integration-test/resources/logback-test.xml b/samples/xml/gemfire-p2p/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/samples/xml/gemfire-p2p/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>
diff --git a/spring-session-data-geode/src/integration-test/resources/log4j2-test.xml b/spring-session-data-geode/src/integration-test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/spring-session-data-geode/src/integration-test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/spring-session-data-geode/src/integration-test/resources/logback-test.xml b/spring-session-data-geode/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/spring-session-data-geode/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>
diff --git a/spring-session-data-geode/src/test/resources/log4j2-test.xml b/spring-session-data-geode/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..ac4c2bd
--- /dev/null
+++ b/spring-session-data-geode/src/test/resources/log4j2-test.xml
@@ -0,0 +1,19 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="${sys:log4j.geode.log.level:-error}"/>
+		<Logger name="org.springframework" level="${sys:log4j.spring.log.level:-error}"/>
+		<Root level="${sys:log4j.log.level:-error}">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/spring-session-data-geode/src/test/resources/logback-test.xml b/spring-session-data-geode/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..81706f7
--- /dev/null
+++ b/spring-session-data-geode/src/test/resources/logback-test.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
+	<logger name="ch.qos.logback" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.apache.geode" level="${logback.log.level:-ERROR}"/>
+
+	<logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
+
+	<root level="${logback.log.level:-ERROR}">
+		<appender-ref ref="console"/>
+	</root>
+
+</configuration>