Skip to content

Commit 0a2d5df

Browse files
jbonofrejbonofre
authored
chore: migrate test log4j.properties to log4j2.properties format (#2312)
Migrate all 10 test resource log4j.properties files to Log4j2 properties format, replacing deprecated Log4j 1.x configuration with the equivalent Log4j2 syntax.
1 parent 71ac457 commit 0a2d5df

12 files changed

Lines changed: 190 additions & 153 deletions

File tree

deployer/kar/src/test/resources/log4j.properties renamed to deployer/kar/src/test/resources/log4j2.properties

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
#
1818
################################################################################
1919

20-
log4j.rootLogger=DEBUG, stdout
20+
# The logging properties used during tests..
21+
rootLogger.level = DEBUG
22+
rootLogger.appenderRef.stdout.ref = stdout
2123

22-
#The logging properties used during tests..
23-
# CONSOLE appender not used by default
24-
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
25-
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
26-
log4j.appender.stdout.layout.ConversionPattern=%-5p %-30.30c{1} - %m%n
27-
log4j.appender.stdout.threshold=DEBUG
24+
# CONSOLE appender
25+
appender.stdout.type = Console
26+
appender.stdout.name = stdout
27+
appender.stdout.layout.type = PatternLayout
28+
appender.stdout.layout.pattern = %-5p %-30.30c{1} - %m%n
29+
appender.stdout.filter.threshold.type = ThresholdFilter
30+
appender.stdout.filter.threshold.level = DEBUG

‎features/core/src/test/resources/log4j.properties‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

jaas/jasypt/src/test/resources/log4j.properties renamed to features/core/src/test/resources/log4j2.properties

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,23 @@
1818
#
1919
# The logging properties used during tests..
2020
#
21-
log4j.rootLogger=INFO, console, file
21+
rootLogger.level = DEBUG
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
2224

23-
# Console will only display warnnings
24-
log4j.appender.console=org.apache.log4j.ConsoleAppender
25-
log4j.appender.console.layout=org.apache.log4j.PatternLayout
26-
log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
27-
#log4j.appender.console.threshold=WARN
25+
logger.karaf-features.name = org.apache.karaf.features.internal.service
26+
logger.karaf-features.level = TRACE
2827

29-
# File appender will contain all info messages
30-
log4j.appender.file=org.apache.log4j.FileAppender
31-
log4j.appender.file.layout=org.apache.log4j.PatternLayout
32-
log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
33-
log4j.appender.file.file=target/test.log
34-
log4j.appender.file.append=true
28+
# Console appender
29+
appender.console.type = Console
30+
appender.console.name = console
31+
appender.console.layout.type = PatternLayout
32+
appender.console.layout.pattern = %d{ISO8601} [%-5.5p] {%t} %c{1} (%F:%L) : %m%n
33+
34+
# File appender
35+
appender.file.type = File
36+
appender.file.name = file
37+
appender.file.fileName = target/test.log
38+
appender.file.append = true
39+
appender.file.layout.type = PatternLayout
40+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

itests/test/src/test/resources/log4j.properties renamed to itests/test/src/test/resources/log4j2.properties

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@
1818
#
1919
# The logging properties used during tests..
2020
#
21-
log4j.rootLogger=INFO, console, file
21+
rootLogger.level = INFO
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
2224

23-
# Console will only display warnings
24-
log4j.appender.console=org.apache.log4j.ConsoleAppender
25-
log4j.appender.console.layout=org.apache.log4j.PatternLayout
26-
log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-32.32C %4L | %m%n
25+
# Console appender
26+
appender.console.type = Console
27+
appender.console.name = console
28+
appender.console.layout.type = PatternLayout
29+
appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-32.32C %4L | %m%n
2730

28-
# File appender will contain all info messages
29-
log4j.appender.file=org.apache.log4j.FileAppender
30-
log4j.appender.file.layout=org.apache.log4j.PatternLayout
31-
log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
32-
log4j.appender.file.file=target/test.log
33-
log4j.appender.file.append=true
31+
# File appender
32+
appender.file.type = File
33+
appender.file.name = file
34+
appender.file.fileName = target/test.log
35+
appender.file.append = true
36+
appender.file.layout.type = PatternLayout
37+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

management/server/src/test/resources/log4j.properties renamed to jaas/blueprint/jasypt/src/test/resources/log4j2.properties

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,20 @@
1818
#
1919
# The logging properties used during tests..
2020
#
21-
log4j.rootLogger=INFO, console, file
21+
rootLogger.level = INFO
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
2224

23-
# Console will only display warnings
24-
log4j.appender.console=org.apache.log4j.ConsoleAppender
25-
log4j.appender.console.layout=org.apache.log4j.PatternLayout
26-
log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
27-
log4j.appender.console.threshold=WARN
25+
# Console appender
26+
appender.console.type = Console
27+
appender.console.name = console
28+
appender.console.layout.type = PatternLayout
29+
appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
2830

29-
# File appender will contain all info messages
30-
log4j.appender.file=org.apache.log4j.FileAppender
31-
log4j.appender.file.layout=org.apache.log4j.PatternLayout
32-
log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
33-
log4j.appender.file.file=target/test.log
34-
log4j.appender.file.append=true
31+
# File appender
32+
appender.file.type = File
33+
appender.file.name = file
34+
appender.file.fileName = target/test.log
35+
appender.file.append = true
36+
appender.file.layout.type = PatternLayout
37+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

jaas/blueprint/jasypt/src/test/resources/log4j.properties renamed to jaas/jasypt/src/test/resources/log4j2.properties

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,20 @@
1818
#
1919
# The logging properties used during tests..
2020
#
21-
log4j.rootLogger=INFO, console, file
21+
rootLogger.level = INFO
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
2224

23-
# Console will only display warnnings
24-
log4j.appender.console=org.apache.log4j.ConsoleAppender
25-
log4j.appender.console.layout=org.apache.log4j.PatternLayout
26-
log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
27-
#log4j.appender.console.threshold=WARN
25+
# Console appender
26+
appender.console.type = Console
27+
appender.console.name = console
28+
appender.console.layout.type = PatternLayout
29+
appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
2830

29-
# File appender will contain all info messages
30-
log4j.appender.file=org.apache.log4j.FileAppender
31-
log4j.appender.file.layout=org.apache.log4j.PatternLayout
32-
log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
33-
log4j.appender.file.file=target/test.log
34-
log4j.appender.file.append=true
31+
# File appender
32+
appender.file.type = File
33+
appender.file.name = file
34+
appender.file.fileName = target/test.log
35+
appender.file.append = true
36+
appender.file.layout.type = PatternLayout
37+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

jaas/modules/src/test/resources/log4j.properties renamed to jaas/modules/src/test/resources/log4j2.properties

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,26 @@
1818
#
1919
# The logging properties used during tests..
2020
#
21-
log4j.rootLogger=INFO, console, file
21+
rootLogger.level = INFO
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
2224

2325
# Suppress logging of WriteToClosedSessionException
24-
log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=OFF
26+
logger.ldap.name = org.apache.directory.server.ldap.LdapProtocolHandler
27+
logger.ldap.level = OFF
2528

26-
# Console will only display warnings
27-
log4j.appender.console=org.apache.log4j.ConsoleAppender
28-
log4j.appender.console.layout=org.apache.log4j.PatternLayout
29-
log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
30-
log4j.appender.console.threshold=WARN
29+
# Console appender
30+
appender.console.type = Console
31+
appender.console.name = console
32+
appender.console.layout.type = PatternLayout
33+
appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
34+
appender.console.filter.threshold.type = ThresholdFilter
35+
appender.console.filter.threshold.level = WARN
3136

32-
# File appender will contain all info messages
33-
log4j.appender.file=org.apache.log4j.FileAppender
34-
log4j.appender.file.layout=org.apache.log4j.PatternLayout
35-
log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
36-
log4j.appender.file.file=target/test.log
37-
log4j.appender.file.append=true
37+
# File appender
38+
appender.file.type = File
39+
appender.file.name = file
40+
appender.file.fileName = target/test.log
41+
appender.file.append = true
42+
appender.file.layout.type = PatternLayout
43+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

‎jaas/spring-security-crypto/src/test/resources/log4j2.properties‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## ---------------------------------------------------------------------------
2+
## Licensed to the Apache Software Foundation (ASF) under one or more
3+
## contributor license agreements. See the NOTICE file distributed with
4+
## this work for additional information regarding copyright ownership.
5+
## The ASF licenses this file to You under the Apache License, Version 2.0
6+
## (the "License"); you may not use this file except in compliance with
7+
## the License. You may obtain a copy of the License at
8+
##
9+
## http://www.apache.org/licenses/LICENSE-2.0
10+
##
11+
## Unless required by applicable law or agreed to in writing, software
12+
## distributed under the License is distributed on an "AS IS" BASIS,
13+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
## See the License for the specific language governing permissions and
15+
## limitations under the License.
16+
## ---------------------------------------------------------------------------
17+
18+
#
19+
# The logging properties used during tests..
20+
#
21+
rootLogger.level = INFO
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
24+
25+
# Console appender
26+
appender.console.type = Console
27+
appender.console.name = console
28+
appender.console.layout.type = PatternLayout
29+
appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
30+
31+
# File appender
32+
appender.file.type = File
33+
appender.file.name = file
34+
appender.file.fileName = target/test.log
35+
appender.file.append = true
36+
appender.file.layout.type = PatternLayout
37+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

jaas/spring-security-crypto/src/test/resources/log4j.properties renamed to management/server/src/test/resources/log4j2.properties

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@
1818
#
1919
# The logging properties used during tests..
2020
#
21-
log4j.rootLogger=INFO, console, file
21+
rootLogger.level = INFO
22+
rootLogger.appenderRef.console.ref = console
23+
rootLogger.appenderRef.file.ref = file
2224

23-
# Console will only display warnnings
24-
log4j.appender.console=org.apache.log4j.ConsoleAppender
25-
log4j.appender.console.layout=org.apache.log4j.PatternLayout
26-
log4j.appender.console.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
27-
#log4j.appender.console.threshold=WARN
25+
# Console appender
26+
appender.console.type = Console
27+
appender.console.name = console
28+
appender.console.layout.type = PatternLayout
29+
appender.console.layout.pattern = %d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
30+
appender.console.filter.threshold.type = ThresholdFilter
31+
appender.console.filter.threshold.level = WARN
2832

29-
# File appender will contain all info messages
30-
log4j.appender.file=org.apache.log4j.FileAppender
31-
log4j.appender.file.layout=org.apache.log4j.PatternLayout
32-
log4j.appender.file.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n
33-
log4j.appender.file.file=target/test.log
34-
log4j.appender.file.append=true
33+
# File appender
34+
appender.file.type = File
35+
appender.file.name = file
36+
appender.file.fileName = target/test.log
37+
appender.file.append = true
38+
appender.file.layout.type = PatternLayout
39+
appender.file.layout.pattern = %d | %-5p | %m | %c | %t%n

‎maven/core/src/test/resources/log4j.properties‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)