Logging refinements for transaction and cache processing (debug/trace)

Issue: SPR-16946

src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ import static org.mockito.BDDMockito.*;
 public class ScheduledAndTransactionalAnnotationIntegrationTests {
 
 	@Before
-	public void setUp() {
+	public void assumePerformanceTests() {
 		Assume.group(TestGroup.PERFORMANCE);
 	}
 
@@ -165,7 +165,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 		}
 
 		@Bean
-		public PersistenceExceptionTranslationPostProcessor peTranslationPostProcessor() {
+		public static PersistenceExceptionTranslationPostProcessor peTranslationPostProcessor() {
 			return new PersistenceExceptionTranslationPostProcessor();
 		}
 	}

src/test/resources/log4j.properties

@@ -1,5 +0,0 @@
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n
-
-log4j.rootCategory=WARN, console

src/test/resources/log4j2-test.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Root level="debug">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>

src/test/resources/testlog4j.properties

@@ -1,2 +0,0 @@
-log4j.rootCategory=DEBUG, mock
-log4j.appender.mock=org.springframework.util.MockLog4jAppender